OSDN Git Service
Sudheer Shanka [Thu, 30 Apr 2015 17:08:49 +0000 (17:08 +0000)]
Merge "Add MDM app label string." into mnc-dev
John Spurlock [Thu, 30 Apr 2015 15:45:53 +0000 (15:45 +0000)]
Merge "Settings: Do not disturb automatic rule updates." into mnc-dev
Jason Monk [Thu, 30 Apr 2015 15:33:39 +0000 (15:33 +0000)]
Merge "Handle no peeking in app info pages" into mnc-dev
John Spurlock [Thu, 30 Apr 2015 13:26:15 +0000 (09:26 -0400)]
Settings: Do not disturb automatic rule updates.
- Remove FAB for adding rules, move to last preference.
- Add first-class event condition type and config sub-page.
- Always show radio buttons when adding rules.
- Add new data model for event rules.
- Add stub condition provider for event rules (always false for now).
- Add rule-type icons to rule preference rows.
Bug:
20064962
Change-Id: Id5acde371eb2e7d22b1f195459897614db5ba80a
Jason Monk [Thu, 30 Apr 2015 15:16:06 +0000 (11:16 -0400)]
Handle no peeking in app info pages
Bug:
20496400
Change-Id: Icdcb997f35497c7664af948ad7ada722835e42b4
Sudheer Shanka [Thu, 30 Apr 2015 09:51:26 +0000 (10:51 +0100)]
Add MDM app label string.
Bug:
20024761
Change-Id: I05480d36a99864653ba2eceb3561b5da242898e6
Jim Miller [Tue, 21 Apr 2015 02:35:40 +0000 (19:35 -0700)]
Automatically show IME when showing the fingerprint delete/rename dialog.
Also a bit of code clean up.
Change-Id: I541a9c9ec031b7075f2812ef938adb9e591757c5
(cherry picked from commit
86ccad0bfd2478ba6822b34ccd6db4d2fab59100)
Jeff Sharkey [Wed, 29 Apr 2015 18:24:57 +0000 (11:24 -0700)]
Returning to wizard, enable migration.
Bring primary storage migration back into the adoption flow, and
provide a path for long-lived notifications to re-launch into the
Settings app. Also provide option to initiate migration if skipped
during wizard. For now, estmiate migration size and time based on
a Class 10 card.
Follow other callback refactoring.
Bug:
19993667
Change-Id: Ia0c28eb114bc6c8066c17b3142ed74f962140c91
Vinit Deshpande [Wed, 29 Apr 2015 23:51:55 +0000 (23:51 +0000)]
Merge "Implement 'Available via Passpoint' feature [DO NOT MERGE]" into mnc-dev
Fabrice Di Meglio [Wed, 29 Apr 2015 21:16:17 +0000 (21:16 +0000)]
Merge "Add user selectable Default Browser feature - part 3" into mnc-dev
Fabrice Di Meglio [Wed, 29 Apr 2015 21:12:19 +0000 (14:12 -0700)]
Add user selectable Default Browser feature - part 3
- fix preference summary
See bug #
20144393
Change-Id: I4ecf46e69bf6bafda87dbc05b7c2f68bbca725cb
Vinit Deshpande [Thu, 16 Apr 2015 18:41:39 +0000 (11:41 -0700)]
Implement 'Available via Passpoint' feature [DO NOT MERGE]
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'
Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6
(cherry picked from commit
08b5b5d4393b3a670208a157520c4dd97f4cfc3a)
Maurice Lam [Wed, 29 Apr 2015 18:17:15 +0000 (18:17 +0000)]
Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev
Jason Monk [Wed, 29 Apr 2015 17:10:34 +0000 (17:10 +0000)]
Merge "Allow filtering system apps on most app lists" into mnc-dev
Jason Monk [Wed, 29 Apr 2015 17:02:08 +0000 (13:02 -0400)]
Allow filtering system apps on most app lists
Change-Id: If852adec4122aca3f11b0f894c0c44d12a75cc77
Andrei Kapishnikov [Wed, 29 Apr 2015 14:13:39 +0000 (14:13 +0000)]
Merge "Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:07:34 +0000 (14:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
John Spurlock [Wed, 29 Apr 2015 14:02:49 +0000 (14:02 +0000)]
Merge "Settings: "No interruptions" -> "Total silence"" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:01:14 +0000 (09:01 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ibbdc2e71ca955cc4cfc648b2f54d592cf5285725
Auto-generated-cl: translation import
Martijn Coenen [Wed, 29 Apr 2015 07:29:30 +0000 (07:29 +0000)]
Merge "New Tap & Pay UX." into mnc-dev
Jeff Sharkey [Tue, 28 Apr 2015 20:41:01 +0000 (13:41 -0700)]
Format as public/private; follow refactoring.
Offer to format an empty disk as public/private.
Bug:
19993667
Change-Id: I69fafaed524f3ef5e65d04a9e3a94789fcfc3087
Andrei Kapishnikov [Thu, 9 Apr 2015 15:08:16 +0000 (11:08 -0400)]
Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag
When DO_NOT_ASK_CREDENTIALS_ON_BOOT flag is set in
DevicePolicyManager, the Settings UI:
1) Should not encrypt the device with password when the
user encrypts the device for the first time. The default
encryption type should be used instead.
2) Should not give the choice to the user whether to
encrypt the device with password/PIN or not but always
encrypt the device without password.
Related CL: https://googleplex-android-review.git.corp.google.com/#/c/665371/
Change-Id: Ic09f02c033a0b16b7ffc45bf6d675b62d1be4bd8
Maurice Lam [Wed, 29 Apr 2015 01:33:50 +0000 (18:33 -0700)]
[WifiSetup] Use default theme for Wi-Fi dialogs
Just use the default theme as the dialog doesn't require any
additional attributes to be specified. (Theme.Settings is setting
alertDialogTheme to Theme.AlertDialog as well).
This will allow the correct accent colors (among other theme
attributes) to be propagated to the dialog.
Bug:
20663720
Change-Id: Ibb12c185e8104ccb8f3ddd01524127c748b47487
Fabrice Di Meglio [Wed, 29 Apr 2015 00:44:12 +0000 (00:44 +0000)]
Merge "Add user selectable Default Browser feature - part 2" into mnc-dev
Fabrice Di Meglio [Tue, 28 Apr 2015 23:58:05 +0000 (16:58 -0700)]
Add user selectable Default Browser feature - part 2
- show full list of Browsers
This change depends on a Framework change which adds a new MATCH_ALL
constant flag in PackageManager for getting the full list.
See bug #
20144393
Change-Id: I6ed29cbac28aaf1a955541db0615a1d20d267fd5
Adrian Roos [Tue, 28 Apr 2015 22:09:35 +0000 (22:09 +0000)]
Merge "Require explicit userId in LockPatternUtils" into mnc-dev
Elliott Hughes [Tue, 28 Apr 2015 20:35:25 +0000 (13:35 -0700)]
Add Pacific/Noumea.
Also move Majuro to the right place in the list. It's +11, not -11.
(cherry-pick of
23ae8827c1bd86ec632eab42d067148f8b3452e8.)
Bug: http://b/
20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
Jorim Jaggi [Fri, 24 Apr 2015 17:19:48 +0000 (10:19 -0700)]
Add animation for fingerprint icon
Also show the "Whoops" dialog when the finger is resting on the icon,
in addition to show it after clicking it for 3 times.
Bug:
20495507
Change-Id: I771da0671f61c13065b011d613f508827cb3b54f
(cherry picked from commit
2c2a41669f276058f7241f86a3aca68d960ac453)
Adrian Roos [Fri, 17 Apr 2015 00:11:22 +0000 (17:11 -0700)]
Require explicit userId in LockPatternUtils
Bug:
18931518
Change-Id: Ie2faa18918aaadf17a84287898438549a693b0cc
Yorke Lee [Tue, 28 Apr 2015 18:58:00 +0000 (18:58 +0000)]
Merge "Simplify DefaultDialerManager" into mnc-dev
Yorke Lee [Tue, 28 Apr 2015 18:35:22 +0000 (11:35 -0700)]
Simplify DefaultDialerManager
The previous code worked with ComponentNames because it was
based off existing code for the default SMS application.
We only really need the package name however, so simplify the
code by storing and retrieving the package name directly.
Bug:
20304458
Change-Id: Icabd3a9f0f8166c105360494b601160d13767fad
John Spurlock [Tue, 28 Apr 2015 15:21:57 +0000 (11:21 -0400)]
Settings: "No interruptions" -> "Total silence"
Bug:
20064962
Change-Id: I318fc5cf4555cfbbd019a7f012c02ab8cb322f2c
Sudheer Shanka [Thu, 9 Apr 2015 11:19:53 +0000 (12:19 +0100)]
Update warning dialog on work profile deletion.
Bug:
20024761
Change-Id: I23b0eaa7742d9d23a29a2a48ab6e3d92fe310560
Martijn Coenen [Tue, 21 Apr 2015 11:47:55 +0000 (13:47 +0200)]
New Tap & Pay UX.
Change-Id: Icbffe0f58d2c37d5691357c13a14ab9a40e53249
Geoff Mendal [Tue, 28 Apr 2015 06:16:11 +0000 (23:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5f859b65d600018c5dc8cf650e5a7f701609acff
Auto-generated-cl: translation import
Alan Viverette [Mon, 27 Apr 2015 16:44:31 +0000 (09:44 -0700)]
Point to Material.Settings themes
Bug:
20546201
Change-Id: Ib6d480d12261101c2e240b23163195ff006a41bd
Yorke Lee [Mon, 27 Apr 2015 22:49:25 +0000 (22:49 +0000)]
Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 22:18:47 +0000 (15:18 -0700)]
Rename setDefaultDialerApplication for consistency
Change-Id: I0749f2cbaaf0e9fd7fb8274a088ca971a33b2a36
Jorim Jaggi [Fri, 24 Apr 2015 17:19:48 +0000 (10:19 -0700)]
Move fingerprint enroll logic into sidecar fragment
So enroll can continue across configuration changes.
Bug:
20495507
Change-Id: I021f2f3e376fcd12c7a698f5fb7f862733cb720a
(cherry picked from commit
64e9c4cb2c7272d07b190cb25c41de5b22563137)
Jorim Jaggi [Fri, 24 Apr 2015 18:12:20 +0000 (11:12 -0700)]
Allow incremental builds for settings.
Change-Id: Iec6788d42c63020b7facfdfc45e1add244bb9523
(cherry picked from commit
c9f73801dfd4815fdaaee1018f9ca40faf5befa1)
Maurice Lam [Mon, 27 Apr 2015 19:19:50 +0000 (19:19 +0000)]
Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev
Maurice Lam [Fri, 24 Apr 2015 06:08:53 +0000 (23:08 -0700)]
[LockSetup] Hide back button in notification interstitial
The back button is disabled because the lock screen is already set
up. Per UX spec, we should hide the back button instead of disabling
it.
Bug:
20427092
Change-Id: Iaaf8860208179dfa5974b172013f9882827c6c4a
Maurice Lam [Mon, 27 Apr 2015 17:31:35 +0000 (17:31 +0000)]
Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev
Maurice Lam [Wed, 22 Apr 2015 01:46:10 +0000 (18:46 -0700)]
[WifiSetup] Show progress bar when scanning
Added setProgressBarVisible method to show the progress bar when the
UI is in a transient state (e.g. enabling / disabling Wi-Fi, scanning
for access points).
Bug:
19674909
Change-Id: I82180b7949a03f6ac468f069febf0ffd1f42f1b7
Jason Monk [Mon, 27 Apr 2015 14:37:01 +0000 (14:37 +0000)]
Merge "Move process stats screen into memory screen." into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 14:14:56 +0000 (09:14 -0500)]
Import translations. DO NOT MERGE
Change-Id: I975ff3310d078dff27ab1d65811cb7026bb968e8
Auto-generated-cl: translation import
Jason Monk [Wed, 25 Mar 2015 13:46:30 +0000 (09:46 -0400)]
Move process stats screen into memory screen.
- Move process stats from developer options to top level
settings item.
- Some minor UI changes to the top of the page
- Major UI updates to detail page, now shows info with processes
as pref categories and services as prefs, with a way to kill
them (taken from Running Services page).
- Some major refactorings in code, in attempt to make it more
usable
- Added color bar on per app basis to visualize the avg/max
relationship
- Updated the way avg is calculated across multiple entries in
ProcStatsPackageEntry to be more accurate
- Change the way max memory is calculated in
ProcStatsPackageEntry to be less accurate but more useful
Bug:
19443802
Change-Id: Ia6aaabe42c415c50997a09bfb814a6f6e5731772
Geoff Mendal [Mon, 27 Apr 2015 01:36:59 +0000 (18:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1ac8f78379eb67ddf2f5d6e92825424dd1aeb23a
Auto-generated-cl: translation import
Geoff Mendal [Sat, 25 Apr 2015 07:12:23 +0000 (00:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05bb4f3a511b9b620bb9fbcf0a9be40ece9eb0ad
Auto-generated-cl: translation import
Etan Cohen [Sat, 25 Apr 2015 00:49:40 +0000 (00:49 +0000)]
Merge changes from topic 'mwd-merge-042415'
* changes:
Merge commit '
377c7c9' into merge2
Merge commit '
22ffff6' into merge2
Andres Morales [Fri, 24 Apr 2015 23:19:35 +0000 (23:19 +0000)]
Merge "Fix crash when rotating NFC dialog"
Etan Cohen [Fri, 24 Apr 2015 21:39:03 +0000 (14:39 -0700)]
Merge commit '
377c7c9' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:38:56 +0000 (14:38 -0700)]
Merge commit '
22ffff6' into merge2
Jorim Jaggi [Fri, 24 Apr 2015 21:34:37 +0000 (21:34 +0000)]
Merge changes from topic 'fingerprint_ui'
* changes:
Add dialog when user touches fingerprint icon
Add pulsing animation for find sensor.
Update fingerprint enroll UI to spec.
Jorim Jaggi [Fri, 24 Apr 2015 00:16:43 +0000 (17:16 -0700)]
Add dialog when user touches fingerprint icon
Bug:
20495507
Change-Id: I6779aba7ca988fd9a8eee07afca2a410de144a26
Jorim Jaggi [Thu, 23 Apr 2015 20:56:33 +0000 (13:56 -0700)]
Add pulsing animation for find sensor.
Bug:
20495507
Change-Id: I5fefb2cdb2625885c906fa2a9b69da1141ce66e0
Jorim Jaggi [Wed, 22 Apr 2015 23:17:23 +0000 (16:17 -0700)]
Update fingerprint enroll UI to spec.
Also adds sliding animations between the steps.
Bug:
20495507
Change-Id: I148d8d8b8082361149f02fd2dc4cead0ba3e2526
Alan Viverette [Fri, 24 Apr 2015 21:08:07 +0000 (21:08 +0000)]
am
4a4f487e: am
b6073c48: am
93ecb1f0: Merge "Settings: Fix wifi developer options summaries"
* commit '
4a4f487e5bfd88644421fd139735543b4a5c7be9':
Settings: Fix wifi developer options summaries
Alan Viverette [Fri, 24 Apr 2015 18:41:05 +0000 (18:41 +0000)]
am
b6073c48: am
93ecb1f0: Merge "Settings: Fix wifi developer options summaries"
* commit '
b6073c486cb2eb537fd6e53000dce55afe762fc1':
Settings: Fix wifi developer options summaries
Alan Viverette [Fri, 24 Apr 2015 18:28:50 +0000 (18:28 +0000)]
am
93ecb1f0: Merge "Settings: Fix wifi developer options summaries"
* commit '
93ecb1f0124da17c55ad52fe572eaf4a8c3868d5':
Settings: Fix wifi developer options summaries
Alan Viverette [Fri, 24 Apr 2015 18:05:09 +0000 (18:05 +0000)]
Merge "Settings: Fix wifi developer options summaries"
Maurice Lam [Fri, 24 Apr 2015 17:55:57 +0000 (17:55 +0000)]
Merge "[WifiSetup] Update Wi-Fi icon color"
Maurice Lam [Fri, 24 Apr 2015 16:29:04 +0000 (09:29 -0700)]
[WifiSetup] Update Wi-Fi icon color
Bug:
20551141
Change-Id: I69a534e8f452ba11be679d8231022b9223caaed3
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."
Andres Morales [Tue, 21 Apr 2015 19:43:03 +0000 (12:43 -0700)]
Fix crash when rotating NFC dialog
Bug:
18710540
Change-Id: I0f50a8aed555439e8beeff70276d646fc11afe0a
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"