OSDN Git Service
Lei Yu [Wed, 9 May 2018 22:08:09 +0000 (15:08 -0700)]
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
am:
1dbe185db2
Change-Id: I14a5de9f360b11de52ecda509fcdeca11d1af0a2
TreeHugger Robot [Wed, 9 May 2018 21:54:26 +0000 (21:54 +0000)]
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
Andreas Terzis [Wed, 9 May 2018 21:31:06 +0000 (14:31 -0700)]
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
am:
b5de55fbfc
Change-Id: Ic31625e5eab080bdb007d85803b2f9eebe430dbf
Matthew Fritze [Wed, 9 May 2018 21:21:22 +0000 (14:21 -0700)]
Merge "Establish permanently unavailable settings" into pi-dev
am:
ab68a8107c
Change-Id: I492624cf4d1fcfba85c0dc6f9042f456ce882ed5
Andreas Terzis [Wed, 9 May 2018 21:15:43 +0000 (21:15 +0000)]
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
TreeHugger Robot [Wed, 9 May 2018 21:13:44 +0000 (21:13 +0000)]
Merge "Establish permanently unavailable settings" into pi-dev
Salvador Martinez [Wed, 9 May 2018 20:41:03 +0000 (13:41 -0700)]
Merge "Remove the Settings search keywords from Slices" into pi-dev
am:
26453818b9
Change-Id: I9dbc077c72a0ca4b29364f7eea39d3e4f82f1fdb
Salvador Martinez [Wed, 9 May 2018 20:30:02 +0000 (20:30 +0000)]
Merge "Remove the Settings search keywords from Slices" into pi-dev
android-build-team Robot [Wed, 9 May 2018 20:03:38 +0000 (13:03 -0700)]
Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
am:
9110d29f13
Change-Id: Ib6ff8cf2cfde3ee12bdb757b4a691b90ba02c398
android-build-team Robot [Wed, 9 May 2018 19:47:02 +0000 (19:47 +0000)]
Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
Andreas Terzis [Wed, 9 May 2018 05:46:03 +0000 (22:46 -0700)]
Increase the char limit of carrier_and_update_text to 32.
The translation of the carrier_and_update_text field
in some European languages requires 32 characters. To
accomodate these requirements increase the character
limit from 30 to 32.
Also, set the field to wrap since the name of the
carrier can be long.
Bug:
76443795
Test: manual
Change-Id: Ic4c3ed0736af0535734590340e9631108707da73
Beverly [Tue, 8 May 2018 14:41:25 +0000 (10:41 -0400)]
DO NOT MERGE Clear deprecated effects when saving zen policy
- Deprecated effects are set in NotificationManagerService,
so unset them before setting the NotificationPolicy
- When user clicks on Custom, they are brought to the custom vis effects
page instead of resetting custom values to presets
Fixes:
79383781
Test: manual
Test: NotificationManagerServiceTest testSetNotificationPolicy_preP_setOldNewFields
Change-Id: Id6db9ce2aaeed6321389f8dbfbea65eda30c74ad
android-build-team Robot [Wed, 9 May 2018 18:19:36 +0000 (11:19 -0700)]
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
am:
27f1e8e1e9
Change-Id: I2457fb1ae8cf8c63d71429c873d6f2b4ef52860f
android-build-team Robot [Wed, 9 May 2018 17:54:30 +0000 (17:54 +0000)]
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
Lei Yu [Tue, 8 May 2018 22:30:17 +0000 (15:30 -0700)]
Use WRAP_CONTENT for battery saver button
Change-Id: Id1d417021eff56c3733f6711f121085ad67ae3da
Fixes:
79256447
Test: Screenshot
Matthew Fritze [Thu, 3 May 2018 23:46:51 +0000 (16:46 -0700)]
Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.
The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.
Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.
Bug:
78910582
Fixes:
79245656
Test: robotests
Change-Id: I42c2cedab66be2d76999795f46470a079cc1ec71
Merged-In: I58821a6cfd6134b3b351657b6edf5f74ead00643
Matthew Fritze [Tue, 8 May 2018 23:34:36 +0000 (16:34 -0700)]
Remove the Settings search keywords from Slices
The keywords used for settings search are good when we are highly
confident the user is searching for as setting (settings search),
but not effective in a more general search setting (launcher,
an assistant). Thus, we should not index these keywords as Slice
keywords, and rely on the setting title and screen title as baseline
keywords.
Change-Id: I99e44834454b5949c4883f877e02be47498e06e2
Fixes:
78911847
Test: robotests
android-build-team Robot [Wed, 9 May 2018 04:04:42 +0000 (21:04 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
9a1d318b37 -s ours
Change-Id: Ie5f9d8b1e7883d2e523a8481616bcb24c3dd9b40
android-build-team Robot [Wed, 9 May 2018 03:56:36 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Hugh Chen [Wed, 9 May 2018 03:09:49 +0000 (20:09 -0700)]
Merge "Change the title when in call/media state" into pi-dev
am:
32adc82c8a
Change-Id: I9f066891464c55fb88ddd95b4f669c3f4e82ebbd
Hugh Chen [Wed, 9 May 2018 03:06:04 +0000 (03:06 +0000)]
Merge "Change the title when in call/media state" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:46:35 +0000 (19:46 -0700)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
am:
f4dd526f70
Change-Id: Iac7db28e7b22f49280e09974a73310061fb01afd
android-build-team Robot [Wed, 9 May 2018 02:36:26 +0000 (02:36 +0000)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:28:29 +0000 (19:28 -0700)]
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
am:
69fce6df71
Change-Id: I9a7e5a5531a81513fb7a0721d04a419cfe957295
android-build-team Robot [Wed, 9 May 2018 02:22:17 +0000 (02:22 +0000)]
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:15:41 +0000 (19:15 -0700)]
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev
am:
af7d41978c
Change-Id: Iff2cc5c284add3017d307ced73b71fe101f13ecc
hughchen [Tue, 17 Apr 2018 08:36:58 +0000 (16:36 +0800)]
Change the title when in call/media state
* Change the title when in call/media state.
Example: call state show "Available call devices"
media state show "Available media devices"
* Use isAudioModeOngoingCall() utility function for checking if it is in call status
* Add register test to verify when in onStart() and onStop()
the BluetoothCallback can be register and unregister.
* Add title string test to verify when in call or media state,
the title can be changed to corresponding string
Bug:
78150641
Test: make -j40 RunSettingsRoboTests
Change-Id: I6be72cf0cae75525084ac3c5be8524c709f51f7d
Merged-In: I6be72cf0cae75525084ac3c5be8524c709f51f7d
android-build-team Robot [Wed, 9 May 2018 02:03:03 +0000 (02:03 +0000)]
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev
android-build-team Robot [Wed, 9 May 2018 00:53:01 +0000 (17:53 -0700)]
Merge "Update strings for summary tip." into pi-dev
am:
0e7cff80ef
Change-Id: I4c891ea16e4fed831998cf609a5d5d2418528856
android-build-team Robot [Wed, 9 May 2018 00:44:18 +0000 (00:44 +0000)]
Merge "Update strings for summary tip." into pi-dev
Doris Ling [Wed, 9 May 2018 00:39:13 +0000 (17:39 -0700)]
Merge "Update arrow icon for see all apps." into pi-dev
am:
6bc31d343e
Change-Id: I56e43f5fc4d4647aaa695bc071141fe7dcb80107
Doris Ling [Wed, 9 May 2018 00:30:59 +0000 (00:30 +0000)]
Merge "Update arrow icon for see all apps." into pi-dev
Fan Zhang [Tue, 8 May 2018 23:29:39 +0000 (16:29 -0700)]
Stop logging tether password in logcat & metrics provider
Change-Id: I7aaaf3148445bfb6c556ab37c6577da67dc94cbb
Fixes:
79419591
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Lei Yu [Tue, 8 May 2018 23:26:35 +0000 (16:26 -0700)]
Don't check battery usage in excessive bg anomaly
We don't need it anymore because we don't auto restrict this
anomaly.
Bug:
79210436
Test: robo test still pass
Change-Id: I186213a57f9bf54a0e19985f2c92169c6dc0571c
android-build-team Robot [Tue, 8 May 2018 23:10:34 +0000 (16:10 -0700)]
Merge "Add back up message id for "Action not allowed"." into pi-dev
am:
c0edff7ffd
Change-Id: I4bfd6e2439ceafb5ed4567c6ead21c7ba8ead5e9
Lei Yu [Tue, 8 May 2018 23:09:48 +0000 (16:09 -0700)]
Merge "Fix crash in anomaly job service" into pi-dev
am:
db5c1cef71
Change-Id: If2946b45ba2e7fe22f5cbd24fabfeb5ef1e4ee7d
android-build-team Robot [Tue, 8 May 2018 22:53:45 +0000 (22:53 +0000)]
Merge "Add back up message id for "Action not allowed"." into pi-dev
Lei Yu [Tue, 8 May 2018 22:52:59 +0000 (22:52 +0000)]
Merge "Fix crash in anomaly job service" into pi-dev
Lei Yu [Tue, 8 May 2018 20:06:42 +0000 (13:06 -0700)]
Update strings for summary tip.
1. Strings for the tip preference
2. Strings for the tip dialog
Change-Id: I59c371328ec735a0b22f707d440f3be85cf59c77
Fixes:
79171948
Test: Manual & RunSettingsRoboTests
Matthew Fritze [Tue, 8 May 2018 21:56:00 +0000 (14:56 -0700)]
Prevent crashes on null intent in Slice Builder
Change-Id: Ia429dd00fce785bc9d23ac8cf15f6855d7fca7c2
Fixes:
79147458
Test: Robotests
yuemingw [Tue, 8 May 2018 21:41:26 +0000 (22:41 +0100)]
Add back up message id for "Action not allowed".
Bug:
78443458
Test: manual
Change-Id: Ib93d8bf767be36323515ecb7cf496a6c234c06fe
Bill Yi [Tue, 8 May 2018 21:34:25 +0000 (14:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I60f5a1972ab0788573426988633195b41086d83c
Lei Yu [Thu, 12 Apr 2018 23:44:45 +0000 (16:44 -0700)]
Fix crash in anomaly job service
If job has been stopped by any reason, we should cancel the background
thread, otherwise it will throw SecurityException when dequeuing from
JobParams.
This CL adds a lock to synchronize the method and stops dequeue work
if job has been canceled.
Change-Id: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Merged-In: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Fixes:
77968649
Test: RunSettingsRoboTests
android-build-team Robot [Mon, 7 May 2018 19:15:53 +0000 (12:15 -0700)]
Merge "Update Support and Tips setting title." into pi-dev
am:
e30007dcc0
Change-Id: I3adf6f5f14d4aaf78054ce429ab7cfd1ff552fd3
android-build-team Robot [Mon, 7 May 2018 19:06:27 +0000 (19:06 +0000)]
Merge "Update Support and Tips setting title." into pi-dev
Julia Reynolds [Mon, 7 May 2018 18:33:29 +0000 (11:33 -0700)]
Merge "DO NOT MERGE DND settings redesign" into pi-dev
am:
e9211d58d2
Change-Id: I23dd32b66fa5ba2630af0dec7e20c6e6099ad90a
Christine Franks [Mon, 7 May 2018 18:30:59 +0000 (11:30 -0700)]
Merge "Add night display pref controllers and change UX" into pi-dev
am:
a1c70443be
Change-Id: Ib43979544865303492c20e25b53d117a044d29c1
Julia Reynolds [Mon, 7 May 2018 18:25:52 +0000 (18:25 +0000)]
Merge "DO NOT MERGE DND settings redesign" into pi-dev
Christine Franks [Mon, 7 May 2018 18:20:25 +0000 (18:20 +0000)]
Merge "Add night display pref controllers and change UX" into pi-dev
Doris Ling [Thu, 3 May 2018 22:18:37 +0000 (15:18 -0700)]
Update Support and Tips setting title.
- change to Tips and support.
Change-Id: Ie4f7a7cd238686316de52bc8641fde863ea82fe8
Fixes:
79164716
Test: rebuild
timhypeng [Mon, 7 May 2018 08:30:36 +0000 (16:30 +0800)]
Update string from "Add device" to "Pair new device" in Setting > Connected devices
Bug:
79298886
Test: make -j50 RunSettingsRoboTests
Change-Id: I172aa867c85532912a06d52ca773f840d25647ec
Julia Reynolds [Fri, 4 May 2018 21:29:45 +0000 (14:29 -0700)]
Hide uneccessary dividers
am:
99902e1faf
Change-Id: I6c5746c701dbb9774898d7e7dd32e041bd1eda76
Julia Reynolds [Fri, 4 May 2018 19:04:55 +0000 (15:04 -0400)]
Hide uneccessary dividers
Test: manual
Change-Id: I159732e35b88815458786b180438380b280410ff
Fixes:
79256291
Julia Reynolds [Fri, 4 May 2018 12:54:53 +0000 (08:54 -0400)]
DO NOT MERGE DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug:
78447976
Christine Franks [Fri, 16 Mar 2018 23:33:18 +0000 (16:33 -0700)]
Add night display pref controllers and change UX
- Convert NightDisplaySettings to a DashboardFragment
- Add preference controllers for all Night Display settings
- Change UX for activation from a toggle to a button
Bug:
73739388
Bug:
69912911
Test: make -j100 and make RunSettingsRoboTests -j100
Change-Id: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
Merged-In: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
android-build-team Robot [Fri, 4 May 2018 05:25:04 +0000 (22:25 -0700)]
Merge "Refactor badging notification preference controller." into pi-dev
am:
7309dddaa3
Change-Id: I198931640f8d0f3b59c966e4f7c6d6143ec6597f
android-build-team Robot [Fri, 4 May 2018 05:18:34 +0000 (05:18 +0000)]
Merge "Refactor badging notification preference controller." into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:47:45 +0000 (19:47 -0700)]
Merge "Metrics for user choices in storage wizard." into pi-dev
am:
1786dcd4f8
Change-Id: I360d9249d8109ab4733657fe28277c26124066c1
android-build-team Robot [Fri, 4 May 2018 02:32:09 +0000 (02:32 +0000)]
Merge "Metrics for user choices in storage wizard." into pi-dev
android-build-team Robot [Thu, 3 May 2018 23:40:21 +0000 (16:40 -0700)]
Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev
am:
9b29aeba5a
Change-Id: Iac3969e34aa8375b84ee5048636a3670e0e5c586
android-build-team Robot [Thu, 3 May 2018 23:15:51 +0000 (23:15 +0000)]
Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev
Doris Ling [Thu, 3 May 2018 20:09:05 +0000 (13:09 -0700)]
Update arrow icon for see all apps.
- update the path value for the right arrow icon.
Bug:
79161670
Test: visual
Change-Id: I529315d096c0a4c78d1bd44fd52129f04bb40b72
android-build-team Robot [Thu, 3 May 2018 18:23:08 +0000 (11:23 -0700)]
Merge "Storage wizard UI tweaks." into pi-dev
am:
0e84839f62
Change-Id: I27d42323da5c0bb65620b3c73f78578de8040704
android-build-team Robot [Thu, 3 May 2018 18:18:55 +0000 (18:18 +0000)]
Merge "Storage wizard UI tweaks." into pi-dev
Chuck Liao [Fri, 30 Mar 2018 10:41:18 +0000 (18:41 +0800)]
Refactor badging notification preference controller.
- Convert inheritance from AbstractPreferenceController to TogglePreferenceController.
- Register BadgingNotificationPreferenceController in XML.
- Add RoboTests test cases for BadgingNotificationPreferenceController.
Fixes:
67997784
Test: RunSettingsRoboTests
Change-Id: If10744c067f065e7c2465ca1fff66895d7dc1c56
Merged-In: If10744c067f065e7c2465ca1fff66895d7dc1c56
Chalard Jean [Thu, 3 May 2018 05:09:27 +0000 (22:09 -0700)]
Show the status of private DNS.
am:
f249555f97
Change-Id: I1e1ba2929e2251ee067580564ecec82f7f8c7d44
Chalard Jean [Thu, 19 Apr 2018 09:23:49 +0000 (18:23 +0900)]
Show the status of private DNS.
This works as follows :
Off → "Off"
Opportunistic, inactive → "Automatic"
Opportunistic, active → "On"
(stealing a string from notifications for this)
Strict, not resolved and/or not validated → "Couldn't connect"
Strict, resolved and validated → Set up hostname
Bug:
73641539
Test: manual, and updated tests pass
Change-Id: Id1132467288d51aa9cb81a04db65dee438ddfad9
Jeff Sharkey [Wed, 2 May 2018 22:12:05 +0000 (16:12 -0600)]
Metrics for user choices in storage wizard.
These metrics help us understand more about how users in the field
are interacting with adoptable storage.
Bug:
37284068
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I2bb9b5b3683c6ed080233aa595c2626685384923
Jeff Sharkey [Tue, 1 May 2018 20:53:25 +0000 (14:53 -0600)]
Storage wizard UI tweaks.
Updated assets from UX, and shift to "GlifV3" to get the latest
theme styles. Verified visually.
Bug:
77469852
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I5bf84e6649577b0c5c874f129fbd1d71c53356e2
Yueming Wang [Wed, 2 May 2018 15:10:30 +0000 (08:10 -0700)]
Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev
am:
4c89530ff2
Change-Id: Idda9afd69aae7eec7c00872be1ad8510409416df
Yueming Wang [Wed, 2 May 2018 14:58:47 +0000 (14:58 +0000)]
Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev
Julia Reynolds [Wed, 2 May 2018 13:53:05 +0000 (06:53 -0700)]
Merge "DO NOT MERGE Update onboarding" into pi-dev
am:
d521588510
Change-Id: Ibd40108722683e048cc841f2e4a5352bb412cf8d
Eran Messeri [Wed, 2 May 2018 13:51:41 +0000 (06:51 -0700)]
Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev
am:
a6d36c4e2e
Change-Id: I8b55406992369ecec72172d0a2620e6b42093d16
Julia Reynolds [Wed, 2 May 2018 13:46:17 +0000 (13:46 +0000)]
Merge "DO NOT MERGE Update onboarding" into pi-dev
Eran Messeri [Wed, 2 May 2018 13:44:48 +0000 (13:44 +0000)]
Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev
yuemingw [Wed, 2 May 2018 12:36:06 +0000 (13:36 +0100)]
Revert policy transparency dialog title to "Action not allowed".
Bug:
78443458
Test: manually by TestDpc.
Change-Id: Ie4a4b6cacb61d7d1a328d67bcf780040efc23ccd
yuemingw [Thu, 19 Apr 2018 11:12:11 +0000 (12:12 +0100)]
Policy transparency dialog should be shown when SwitchBar is restricted.
After ag/
3818911, touch event of Switchbar is delegated to the switch.
When the SwithBar is disabled by admin, switch is GONE and restricted icon
is VISIBLE instead. We should let touch event be delegaed to restricted
icon and show policy transparency dialog when it's clicked in this case.
Bug:
77898233
Bug:
70206452
Test: Manually via setting disallow_share_location in TestDPC.
Merged-In: Ifa4fa6ebbe7986277f5cd0951a399ea2377a39f9
Change-Id: If4a5349134e6f0e064561b4860966f950ce423b3
Julia Reynolds [Tue, 1 May 2018 20:57:50 +0000 (16:57 -0400)]
DO NOT MERGE Update onboarding
Change text and add 'repeat callers'
Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes:
78448988
hughchen [Wed, 2 May 2018 07:20:53 +0000 (00:20 -0700)]
Remove the gear icon and change tapping event
am:
8dcd550d36
Change-Id: I404d9abb5338785c74c0587e838f4bce9594c228
hughchen [Tue, 24 Apr 2018 07:46:30 +0000 (15:46 +0800)]
Remove the gear icon and change tapping event
* Remove the gear icon in "currently connected" section.
* Change the tapping event in "currently connected" section.
When tapping device in this section, take user to device detail page.
Bug:
78490845
Test: make -j40 RunSettingsRoboTests
Change-Id: I25f8455def3c38e24dea9af9e9e29ba37c250f67
Merged-In: I25f8455def3c38e24dea9af9e9e29ba37c250f67
android-build-team Robot [Wed, 2 May 2018 00:17:41 +0000 (17:17 -0700)]
Merge "Update cellular data condition icon and padding." into pi-dev
am:
1a38390728
Change-Id: I2372af3d9e40cf3d0d4bcc1f13dffe6d856af18f
android-build-team Robot [Wed, 2 May 2018 00:08:11 +0000 (00:08 +0000)]
Merge "Update cellular data condition icon and padding." into pi-dev
android-build-team Robot [Tue, 1 May 2018 23:16:52 +0000 (16:16 -0700)]
Merge "Workaround task-resolution bug in AM" into pi-dev
am:
bb5a46fabd
Change-Id: Ie3def1978876a5429dc6888de69c2b7c51ed0faa
android-build-team Robot [Tue, 1 May 2018 23:08:15 +0000 (23:08 +0000)]
Merge "Workaround task-resolution bug in AM" into pi-dev
Fan Zhang [Tue, 1 May 2018 22:27:01 +0000 (15:27 -0700)]
Update cellular data condition icon and padding.
Change-Id: I01fcdcc09a81758eb12e898aea5d64fa1dc6ef06
Fixes:
79090390
Test: visual
Eran Messeri [Mon, 2 Apr 2018 20:10:00 +0000 (23:10 +0300)]
Require work profile to be unlocked for changing notification settings in a different way
Rather than check for the state of the work profile in
LockScreenNotificationPreferenceController#handlePreferenceTreeClick, do so in
the RestrictedListPreference#performClick.
The drawback of checking the state in handlePreferenceTreeClick is that the
preferences are displayed first and then the requirement to unlock/enable the
work profile is displayed on top of it.
This is rather poor UX, so switch to doing the check in performClick and
returning early if the work profile needs to be unlocked/enabled.
This is similar to Patchset 1 from ag/
3805482.
The main difference is that the user is returned to the settings screen
both after enabling the work profile and unlocking it.
Test: Manually with TestDPC
Test: atest SettingsRoboTests:RestrictedListPreferenceTest
Bug:
77408805
Merged-In: Id168911b082fffac193cd7c7a658ab92d6ce2c15
Change-Id: I0a3a4ec4dda78e28ee88a11d383eda49e9cf50a6
android-build-team Robot [Tue, 1 May 2018 20:21:05 +0000 (13:21 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
a020cc9c0a -s ours
Change-Id: I4417e943078fd0f831b583736951bf42e96b1e55
android-build-team Robot [Tue, 1 May 2018 20:16:51 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Doris Ling [Tue, 1 May 2018 20:06:04 +0000 (13:06 -0700)]
Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev
am:
5ddff9371d
Change-Id: I26b3122b17b71e9729d198bcbaa8f1620c40e06e
Doris Ling [Tue, 1 May 2018 19:58:56 +0000 (19:58 +0000)]
Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev
android-build-team Robot [Tue, 1 May 2018 19:41:31 +0000 (12:41 -0700)]
Merge "Disable 'remove' option while setting is selected" into pi-dev
am:
24cfa88e19
Change-Id: I2f737729d9525623bc4b5edb5ff84cae07ee007e
android-build-team Robot [Tue, 1 May 2018 19:34:15 +0000 (19:34 +0000)]
Merge "Disable 'remove' option while setting is selected" into pi-dev
Fan Zhang [Tue, 1 May 2018 19:25:44 +0000 (12:25 -0700)]
Merge "Add a test to verify lifecycle events are triggered" into pi-dev
am:
139ebd91c0
Change-Id: Ia8ce612d5daa6bb17114188729a295c684eef2e0
Fan Zhang [Tue, 1 May 2018 19:04:44 +0000 (19:04 +0000)]
Merge "Add a test to verify lifecycle events are triggered" into pi-dev
Bill Yi [Tue, 1 May 2018 18:47:35 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
78510764
Change-Id: I675f55ab20567796d3580e386fecc87d4f8c3d78
Julia Reynolds [Tue, 1 May 2018 14:07:59 +0000 (10:07 -0400)]
Disable 'remove' option while setting is selected
Test: robotests
Bug:
78916709
Change-Id: Id1dfc3b61a80c2e0677472ae84dc7425116825f0
Julia Reynolds [Tue, 1 May 2018 17:33:18 +0000 (10:33 -0700)]
Update zen onboarding ui
am:
29ba3601b0
Change-Id: I2c1769f683dd464c96e758b61bd5e47b4a538c44
Winson Chung [Tue, 1 May 2018 17:22:08 +0000 (10:22 -0700)]
Workaround task-resolution bug in AM
- Keep launching notification settings in the Settings task. This is not
the expected behavior, but only a workaround until b/
72420153 is
fixed.
Bug:
72420153
Test: Enter PIP, go to app > notifications > additional settings, ensure
that it doesn't start in the PIP task
Change-Id: I73e704a283285462d4884db21923818cfb6deead
Julia Reynolds [Mon, 30 Apr 2018 13:13:34 +0000 (09:13 -0400)]
Update zen onboarding ui
Test: robotests
Bug:
78448988
Change-Id: I1e70bf8d28f392b93bb102622340da0af65f4718
android-build-team Robot [Tue, 1 May 2018 02:40:16 +0000 (19:40 -0700)]
Merge "Fix a NPE where developer options page crash sometimes." into pi-dev
am:
d940a680a5
Change-Id: Ida116e1bedb08795077991c391426fce5d820bca