OSDN Git Service
Zoltan Szatmary-Ban [Fri, 24 Apr 2015 16:23:48 +0000 (17:23 +0100)]
Fix NPE when tapping on Add Network in Settings > WiFi
Bug:
20542955
Change-Id: I06cfc21f906f94b2b61f2121c22c3d3318c9e65b
Nicolas Prevot [Fri, 24 Apr 2015 15:08:49 +0000 (15:08 +0000)]
Merge "Give MANAGE_PROFILE_AND_DEVICE_OWNERS to Settings."
John Spurlock [Fri, 24 Apr 2015 12:54:43 +0000 (12:54 +0000)]
Merge "Settings: Ensure zen day-of-week formats use current locale."
Jason Monk [Fri, 24 Apr 2015 11:48:46 +0000 (11:48 +0000)]
Merge "Tint dashboard items coming from external tiles"
Jeff Sharkey [Fri, 24 Apr 2015 02:37:41 +0000 (19:37 -0700)]
Migrate package movement to use new API.
We now kick off the move immediately, and pass along the "ID" of the
move in progress. This allows the progress activity to be completely
destroyed and recreated without kicking off a second conflicting move
operation.
Also uses new cleaner movement API that accepts direct VolumeInfo.
Bug:
19993667
Change-Id: I28bc268fcb42dfc9152020b16ef7058d63157597
John Spurlock [Fri, 24 Apr 2015 00:28:58 +0000 (20:28 -0400)]
Settings: Ensure zen day-of-week formats use current locale.
Don't share SimpleDateFormat instances per-process, convert to
per-instance to ensure we're always using the current locale.
Updated version of:
https://android-review.googlesource.com/#/c/147246/
Change-Id: Id464c35035c1de0a7894e5e19b57934f77df9769
Tony Mantler [Thu, 23 Apr 2015 22:40:09 +0000 (22:40 +0000)]
Merge "Move StorageMeasurement to SettingsLib"
Tony Mantler [Thu, 23 Apr 2015 22:19:40 +0000 (15:19 -0700)]
Move StorageMeasurement to SettingsLib
Change-Id: I00335fe896ef1bae11c382592eea2a354269818a
Jason Monk [Thu, 23 Apr 2015 19:56:20 +0000 (19:56 +0000)]
Merge "Fix crash in notifications app list"
Jason Monk [Thu, 23 Apr 2015 19:45:54 +0000 (15:45 -0400)]
Fix crash in notifications app list
Bug:
20310018
Change-Id: I670c4cd10607c84a6c185d6dce579da497b6bb65
Jason Monk [Thu, 23 Apr 2015 18:46:46 +0000 (18:46 +0000)]
Merge "Update notification strings in app info"
Jason Monk [Thu, 23 Apr 2015 18:41:04 +0000 (14:41 -0400)]
Update notification strings in app info
Bug:
20496114
Change-Id: I98698ae082fec614d0480697885049ffe2e8dcf7
Maurice Lam [Thu, 23 Apr 2015 18:14:45 +0000 (18:14 +0000)]
Merge "[WifiSettings] Vector drawables for Wi-Fi signal icon"
Jason Monk [Thu, 23 Apr 2015 18:08:21 +0000 (18:08 +0000)]
Merge "Change owner info to be a dialog rather than screen"
Maurice Lam [Tue, 21 Apr 2015 01:18:54 +0000 (18:18 -0700)]
[WifiSettings] Vector drawables for Wi-Fi signal icon
Update wifi_signal to be a vector drawable that uses the color
from the theme attribute wifi_signal_color.
Bug:
20452312
Change-Id: Id151406e7dd3487050a0d3f440b0d620c8c84dcb
Jason Monk [Thu, 23 Apr 2015 17:55:33 +0000 (17:55 +0000)]
Merge "Allow users to re-enable apps once disabling them"
Yorke Lee [Thu, 23 Apr 2015 17:35:49 +0000 (17:35 +0000)]
Merge "Add default phone app to system settings"
Maurice Lam [Thu, 23 Apr 2015 17:24:04 +0000 (17:24 +0000)]
Merge "[LockSetup] Add padding to lock setup screens"
Jason Monk [Thu, 23 Apr 2015 16:52:39 +0000 (12:52 -0400)]
Allow users to re-enable apps once disabling them
Entries in the app list should not be disabled, instead we should
be filtering for only items the user can modify.
Bug:
20210219
Change-Id: Ida298a9ba16c1201ac238b85f299bdc7b0ae7a1d
Jason Monk [Tue, 21 Apr 2015 17:26:36 +0000 (13:26 -0400)]
Tint dashboard items coming from external tiles
So they can match the Settings theme.
Bug:
20449897
Change-Id: I33ad0d78dad6fbc9dae35552246a559b6508deaf
Jason Monk [Thu, 23 Apr 2015 14:42:15 +0000 (14:42 +0000)]
Merge "New UX for app usage screen"
Jason Monk [Fri, 17 Apr 2015 18:34:12 +0000 (14:34 -0400)]
New UX for app usage screen
Now uses ManageApplications base, and has a details screen which has
a switch and a link to optional app settings.
Bug:
20290386
Change-Id: If32ce8d82e55f3908644c575925b3f6506a68e6e
Maurice Lam [Thu, 23 Apr 2015 00:37:14 +0000 (17:37 -0700)]
[LockSetup] Add padding to lock setup screens
Add SuwContentFrame to the style of the lock screen setup screens so
that paddings are applied.
Bug:
19612353
Change-Id: I8ca42b23f03c48b670fce0966ea537ddf8919b7b
Sanket Padawe [Wed, 4 Mar 2015 01:43:38 +0000 (17:43 -0800)]
Disable data sim selection when phone call active.
Bug:
19301456
Bug:
19150497
Change-Id: I396641b24e78616c93510bf367b61fa7c47ec068
Maurice Lam [Wed, 22 Apr 2015 17:36:49 +0000 (17:36 +0000)]
Merge "[Setup] Use SetupWizardLayout"
Robin Lee [Wed, 22 Apr 2015 16:41:19 +0000 (16:41 +0000)]
Merge "vpn2: show third-party VPN services"
Nicolas Prevot [Wed, 22 Apr 2015 15:26:45 +0000 (16:26 +0100)]
Give MANAGE_PROFILE_AND_DEVICE_OWNERS to Settings.
This permission will be required to set the profile owner.
Change-Id: I695f73b5fddfa7652b04e5e929ce9e91e62dc081
Jason Monk [Tue, 21 Apr 2015 15:20:20 +0000 (11:20 -0400)]
Change owner info to be a dialog rather than screen
Bug:
15937670
Change-Id: I8d8609ff165c4a76e318a80a62fb1dc9effbc82a
Geoff Mendal [Wed, 22 Apr 2015 13:11:16 +0000 (08:11 -0500)]
Import translations. DO NOT MERGE
Change-Id: I921201f47bbaa1b29c6f4c42131123c439207e40
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Wed, 22 Apr 2015 10:10:32 +0000 (10:10 +0000)]
Merge "Show dialog when user tries to edit a locked down WiFi config"
Yorke Lee [Tue, 21 Apr 2015 17:18:51 +0000 (10:18 -0700)]
Add default phone app to system settings
Bug:
20303635
Change-Id: Ibf052fa92347bff49a638c4042d899c9d6587410
Lucky Zhang [Tue, 21 Apr 2015 22:42:53 +0000 (22:42 +0000)]
Merge "[SetupWizard] Refactor WifiSetupActivity"
Lucky Zhang [Tue, 21 Apr 2015 04:05:22 +0000 (21:05 -0700)]
[SetupWizard] Refactor WifiSetupActivity
Refactor WifiSetupActivity to respect the conventional logic of Setup
Wizard's SubactivityWrapper. WifiSetupActivity now returns the result
code back to WifiSettingsWrapper and lets the Wrapper invoke
WizardManager, instead of invoking WizardManager by itself and letting
its Wrapper finish early.
The related change in WifiSettingsWrapper on Setup Wizard side is
ag/676788.
Bug:
20309008
Change-Id: Ia3bc2ff390404ff87c427782b5e7b345050bea03
Jeff Sharkey [Tue, 21 Apr 2015 19:55:11 +0000 (19:55 +0000)]
Merge "Use disk directly from volume in storage wizard."
Robin Lee [Thu, 9 Apr 2015 16:13:08 +0000 (17:13 +0100)]
vpn2: show third-party VPN services
VPN apps are shown alongside configured VPNs now. The requirement that
a password is set is now only enforced when setting up a configured
VPN as this is not necessary for apps.
Some UI redesign.
Bug:
19573824
Bug:
17474682
Bug:
19575658
Change-Id: I02bd977136929647d65b9784fb4cc5df24b45428
Jason Monk [Tue, 21 Apr 2015 18:07:49 +0000 (18:07 +0000)]
Merge "Fix filtering for manage apps"
Jason Monk [Tue, 21 Apr 2015 17:55:10 +0000 (13:55 -0400)]
Fix filtering for manage apps
Bug:
20453766
Change-Id: Ia4a0f0d9a652332944ef846770d5bc4cc50395d9
Jim Miller [Tue, 21 Apr 2015 17:46:07 +0000 (17:46 +0000)]
Merge "Remove enroll haptic feedback since it's now part of the framework."
Chris Wren [Tue, 21 Apr 2015 17:24:30 +0000 (17:24 +0000)]
Merge "Intrument the act of banning a package's notifications."
Maurice Lam [Tue, 21 Apr 2015 17:23:39 +0000 (17:23 +0000)]
Merge "[WifiSetup] Update Wi-Fi icon colors"
Maurice Lam [Sun, 19 Apr 2015 03:11:59 +0000 (20:11 -0700)]
[Setup] Use SetupWizardLayout
Use SetupWizardLayout for the screens that show in Settings to get
better visual consistency and new features like showing a progress
bar in list view.
Bug:
19594252
Change-Id: I53ab17a4c2d922a362e3762f1cdccb512f7d8f6e
Chris Wren [Tue, 21 Apr 2015 16:34:57 +0000 (12:34 -0400)]
Intrument the act of banning a package's notifications.
Bug:
20451514
Change-Id: I0c065a7baaf84442e415d9a6c7dce79457fb311e
Barnaby James [Tue, 21 Apr 2015 04:10:17 +0000 (21:10 -0700)]
Add toast notification to VoiceSettingsActivity.
Change-Id: Ic007b2eda8d082cf27e4aa4edf19b5387edb4b74
Jim Miller [Tue, 21 Apr 2015 02:14:42 +0000 (19:14 -0700)]
Remove enroll haptic feedback since it's now part of the framework.
Change-Id: Ic108d2fcbcac5baa219f49e4441522bfaa85fbff
Maurice Lam [Mon, 20 Apr 2015 21:05:55 +0000 (14:05 -0700)]
[WifiSetup] Update Wi-Fi icon colors
For the new blue-themed setup wizard, update the colors of the Wi-Fi
icons. This reuses the abandoned wifi_signal_colored XML, update it
to reference the new material wifi_signal_teal icon. Only the shape
of wifi_signal_teal is used. Tint is applied to the icon so that the
actual color is defined by wifi_signal_color attr in the theme.
Bug:
19729981
Change-Id: I59a8c137086f2e80eb7e10880626098243b14d13
Maurice Lam [Mon, 20 Apr 2015 21:50:55 +0000 (21:50 +0000)]
Merge "[Setup] Update illustration assets"
Maurice Lam [Fri, 17 Apr 2015 20:36:58 +0000 (13:36 -0700)]
[Setup] Update illustration assets
Update to the new blue-themed assets.
Note that the size of tileable assets, like illustration_tile, and the
width of tablet assets may be different, but the overall visual result
of the layout should be the same.
Bug:
19729981
Change-Id: I4ec44a8e1488b734ec2eddee046a305104e87abb
Stuart Scott [Mon, 20 Apr 2015 17:56:48 +0000 (17:56 +0000)]
Merge "Correct the way settings deals with subscriptions."
Maurice Lam [Mon, 20 Apr 2015 16:55:38 +0000 (16:55 +0000)]
Merge "[WifiSetup] Remove required info"
Zoltan Szatmary-Ban [Wed, 15 Apr 2015 12:42:13 +0000 (13:42 +0100)]
Show dialog when user tries to edit a locked down WiFi config
Also, 'FORGET' button is not shown on WifiDialogs of locked down configs.
Context menu only shows 'Connect' for them.
Bug:
20117316
Change-Id: I3fa986c10b6ff47d1a897794213c225c8c6f579b
Barnaby James [Mon, 20 Apr 2015 14:18:14 +0000 (14:18 +0000)]
Merge "Add more settings voice synonyms."
Barnaby James [Mon, 20 Apr 2015 14:04:59 +0000 (07:04 -0700)]
Add more settings voice synonyms.
Add some more synonyms until server side matching is improved (b/
20378313).
Change-Id: I9ada119614ddfeedbb43cbda9975737311b5b3dc
Geoff Mendal [Mon, 20 Apr 2015 13:12:08 +0000 (08:12 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ibc6408581ba999e5c019ff7cd4697bdefba8849f
Auto-generated-cl: translation import
Erik Kline [Mon, 20 Apr 2015 04:33:31 +0000 (13:33 +0900)]
Use CONNECTIVITY_ACTION instead _IMMEDIATE
With the demise of the connectivity change delay
CONNECTIVITY_ACTION and CONNECTIVITY_ACTION_IMMEDIATE are
issued back to back.
CONNECTIVITY_ACTION_IMMEDIATE is being reaped.
Bug:
20013379
Change-Id: I71d1752cf3b2ebc377127c5fb7bf0864da9a860a
Jeff Sharkey [Sun, 19 Apr 2015 21:59:04 +0000 (14:59 -0700)]
Use disk directly from volume in storage wizard.
Otherwise we're upset moving apps back to internal storage, which
is a private volume without a disk.
Bug:
19993667
Change-Id: I59e78bf13e14a68b0f4f1c6cbee35f6f7fd8d6ca
Jeff Sharkey [Sat, 18 Apr 2015 23:25:29 +0000 (23:25 +0000)]
Merge "Use new VolumeInfo helper methods."
Jeff Sharkey [Sat, 18 Apr 2015 23:22:10 +0000 (16:22 -0700)]
Use new VolumeInfo helper methods.
Makes it clearer if we're checking for readable/writable state,
and puts emulated/private conversion logic in single place.
Bug:
19993667
Change-Id: I953f5c184ca62afc631d855e64cd8a4972320148
Geoff Mendal [Sat, 18 Apr 2015 05:04:27 +0000 (22:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26d5deda28b97d156af1458e0a078514dd4039b7
Auto-generated-cl: translation import
Maurice Lam [Sat, 18 Apr 2015 00:48:21 +0000 (00:48 +0000)]
Merge "Use SetupWizardLib helpers"
Andres Morales [Fri, 17 Apr 2015 19:42:52 +0000 (19:42 +0000)]
Merge "Unbreak CC screen"
Maurice Lam [Fri, 17 Apr 2015 19:17:21 +0000 (19:17 +0000)]
Merge "[LockScreenSetup] Start SUW-style screens in setup flow"
Tony Mantler [Fri, 17 Apr 2015 16:13:37 +0000 (16:13 +0000)]
Merge "Move PermissionsInfo to SettingsLib"
Maurice Lam [Wed, 4 Mar 2015 02:27:48 +0000 (18:27 -0800)]
Use SetupWizardLib helpers
Use SystemBarHelper, WizardManagerHelper and themes from Setup Wizard
Library.
Bug:
19594252
Change-Id: I60b6ab4f086a170ac270fb08325fc42010293523
Maurice Lam [Wed, 15 Apr 2015 23:12:29 +0000 (16:12 -0700)]
[WifiSetup] Remove required info
Required info is not used anymore and can be removed.
Bug:
10929897
Change-Id: I9f5648426058a5fb1c5e52f1983fee1a5448edb0
Maurice Lam [Fri, 17 Apr 2015 01:11:42 +0000 (18:11 -0700)]
[LockScreenSetup] Start SUW-style screens in setup flow
Implement the new overloaded methods in the setup-specific screens
so that the SUW-styled screens will be started instead of the regular
ones as seen in Settings.
Bug:
20304053
Change-Id: I68e778e6421cfe08e20c9b4af9ed98e0f5ebcee1
Andres Morales [Thu, 16 Apr 2015 23:30:31 +0000 (16:30 -0700)]
Unbreak CC screen
Re-add logic in authenticationSucceeded
Change-Id: Iac1925f5e2f2f67dd5d7c7f5d454f32691d51b61
Tony Mantler [Thu, 16 Apr 2015 22:42:46 +0000 (15:42 -0700)]
Move PermissionsInfo to SettingsLib
Change-Id: Ibe587365b841d7e68d7bb7b7999656f73d9d9bc7
Andres Morales [Thu, 16 Apr 2015 21:38:50 +0000 (21:38 +0000)]
Merge "Fix issues in FP Settings"
Sanket Padawe [Thu, 16 Apr 2015 20:24:40 +0000 (20:24 +0000)]
Merge "Fix alignment issue with mac address in Wifi Settings"
Sanket Padawe [Thu, 16 Apr 2015 20:21:37 +0000 (20:21 +0000)]
Merge "Remove "Show apps" and add summary to saved networks from Wifi Settings."
Jason Monk [Thu, 16 Apr 2015 18:16:58 +0000 (18:16 +0000)]
Merge "Filter app list by storage volume"
Maurice Lam [Thu, 16 Apr 2015 16:33:06 +0000 (16:33 +0000)]
Merge "[WifiSetup] Make dialogs immersive"
Elliott Hughes [Thu, 16 Apr 2015 15:45:53 +0000 (15:45 +0000)]
am
ce9a533c: am
48e7e2ac: am
2e30bff1: Merge "Add Europe/Madrid."
* commit '
ce9a533c7103fb3469f833066fc05579d16b48f9':
Add Europe/Madrid.
Jason Monk [Thu, 16 Apr 2015 15:45:34 +0000 (11:45 -0400)]
Filter app list by storage volume
(when coming from storage settings)
Bug:
19989309
Change-Id: I932b67d25b5c9305067969ba13acb1a9f78e6cdb
Elliott Hughes [Thu, 16 Apr 2015 15:34:58 +0000 (15:34 +0000)]
am
48e7e2ac: am
2e30bff1: Merge "Add Europe/Madrid."
* commit '
48e7e2ac182b94b7c2b682874d0dea969b59339a':
Add Europe/Madrid.
Elliott Hughes [Thu, 16 Apr 2015 15:24:40 +0000 (15:24 +0000)]
am
2e30bff1: Merge "Add Europe/Madrid."
* commit '
2e30bff1351fafd2bbad2c46c55515e74f5d027c':
Add Europe/Madrid.
Barnaby James [Thu, 16 Apr 2015 15:23:49 +0000 (15:23 +0000)]
Merge "UI Tweaks to Zen Mode Voice Activity."
John Spurlock [Thu, 16 Apr 2015 15:03:38 +0000 (11:03 -0400)]
Settings: Use new media icons for slider pref.
Bug:
20096341
Change-Id: I0117cce573cf4234eb6dbd9b16f82093af6df833
Elliott Hughes [Thu, 16 Apr 2015 15:03:03 +0000 (15:03 +0000)]
Merge "Add Europe/Madrid."
Barnaby James [Wed, 15 Apr 2015 22:43:30 +0000 (15:43 -0700)]
UI Tweaks to Zen Mode Voice Activity.
Small cleanup of the UI / strings.
- Cleanup of string constant names.
- Add a specific string for ZenModeVoiceActivity label.
- Change look of list position indicators.
- Add optional header to VoiceSettingsActivity.
- Fix NPE in some cases when disabling Zen mode.
Change-Id: Ic09ee2b1b5a50891b5447c2db0e3de3c475696bf
John Spurlock [Thu, 16 Apr 2015 01:15:55 +0000 (21:15 -0400)]
Settings: Fabulous "Add rule" button.
Bug:
20064962
Change-Id: If7ff9d6cdfc61e5dd9e0d3bc4e2228c5fdaf9fa9
Jeff Sharkey [Thu, 16 Apr 2015 05:50:13 +0000 (05:50 +0000)]
Merge "Move packages between candidate volumes."
Jeff Sharkey [Wed, 15 Apr 2015 21:32:25 +0000 (14:32 -0700)]
Move packages between candidate volumes.
We now allow moving packages between all possible candidate volumes,
as determined by the framework. Moving now jumps through wizard to
help user understand what's going on.
Bug:
19993667
Change-Id: I5416ed2865f400b1d718c68a3f0e033080fefa0e
Andres Morales [Thu, 16 Apr 2015 00:45:30 +0000 (17:45 -0700)]
Fix issues in FP Settings
- A crash in FP settings due to a null activity
- FP settings launching confirm credentials twice on rotation
Change-Id: Ie8c743a14e2a2f1adbdcf7693687fa66663c105d
Elliott Hughes [Thu, 16 Apr 2015 00:37:16 +0000 (17:37 -0700)]
Add Europe/Madrid.
50 million Spaniards can't be wrong.
Bug:
19519953
Change-Id: I10712165d32d90977453e7053057e6260c005f84
Jason Monk [Wed, 15 Apr 2015 21:23:40 +0000 (21:23 +0000)]
Merge "Fix crash in settings from incorrect parcelization"
Jason Monk [Wed, 15 Apr 2015 21:21:32 +0000 (17:21 -0400)]
Fix crash in settings from incorrect parcelization
Bug:
20159614
Change-Id: Id7bf48f2337c8764a37b5f6ff836fbae4019c747
Andres Morales [Wed, 15 Apr 2015 20:50:44 +0000 (20:50 +0000)]
Merge "fingerprint settings: pass auth token to FPEnroll"
Jorim Jaggi [Wed, 15 Apr 2015 17:56:21 +0000 (17:56 +0000)]
Merge "Fix crash on tablets"
Jorim Jaggi [Wed, 15 Apr 2015 17:54:19 +0000 (10:54 -0700)]
Fix crash on tablets
Bug:
20207600
Change-Id: I9e4a795f9ec9b6d075c1814c89b1c0df4f1c1340
Adrian Roos [Wed, 15 Apr 2015 17:38:31 +0000 (17:38 +0000)]
Merge "Hide emergency app setting when not available"
P.Y. Laligand [Wed, 15 Apr 2015 17:27:22 +0000 (17:27 +0000)]
Merge "Fixed typo in package name."
Geoff Mendal [Wed, 15 Apr 2015 13:05:48 +0000 (08:05 -0500)]
Import translations. DO NOT MERGE
Change-Id: I89102328ee0dbaeed00736d0b30134519791f347
Auto-generated-cl: translation import
Lorenzo Colitti [Wed, 15 Apr 2015 11:48:12 +0000 (11:48 +0000)]
Merge "Dialog box for networks without an Internet connection"
Lorenzo Colitti [Fri, 3 Apr 2015 08:31:19 +0000 (17:31 +0900)]
Dialog box for networks without an Internet connection
Bug:
20081183
Change-Id: If4866a341382fa37745ae5aa2d10372f052d5dd6
Jeff Sharkey [Wed, 15 Apr 2015 06:20:32 +0000 (06:20 +0000)]
Merge "Avoid a few crashes around unmounting."
Jeff Sharkey [Wed, 15 Apr 2015 06:16:59 +0000 (23:16 -0700)]
Avoid a few crashes around unmounting.
Also refresh UI when metadata changes.
Bug:
19993667
Change-Id: Ib0ea9be68a3db5c71d15fae6809f31df43fd9af0
Jim Miller [Wed, 15 Apr 2015 02:33:51 +0000 (19:33 -0700)]
Add actual auth token to Settings Enroll flow.
Change-Id: Ie25b5b808b492ddffc64d53f1e801b0654a44189
Jeff Sharkey [Wed, 15 Apr 2015 04:42:46 +0000 (21:42 -0700)]
Storage accessors; persist nickname, flags.
Move to using new public accessors on DiskInfo and VolumeInfo.
Persist nickname changes, and remember when user has initialized a
public volume. Also skip the migration part of storage wizard until
it's implemented.
Bug:
19993667
Change-Id: I642fb43afb95380fddd48a1dad438e87b06454da
Andres Morales [Wed, 15 Apr 2015 02:01:51 +0000 (19:01 -0700)]
fingerprint settings: pass auth token to FPEnroll
Change-Id: I6e8d6d2eb5a2b5d2828af76047839ed79f804104