OSDN Git Service

android-x86/packages-apps-Settings.git
6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 13 Apr 2018 00:28:48 +0000 (17:28 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 660e824061  -s ours

Change-Id: I18553a43f293c1d02a1a7d4a8c9e8c0d74fb9cb7

6 years agoMerge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev
Fan Zhang [Fri, 13 Apr 2018 00:13:35 +0000 (17:13 -0700)]
Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev
am: f0c7038efe

Change-Id: I200feacea89591edc0b446d59e6b4a23a5daa7cd

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 00:10:32 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Shuffle sound settings UI arrangment" into pi-dev
ryanywlin [Thu, 12 Apr 2018 23:57:04 +0000 (16:57 -0700)]
Merge "Shuffle sound settings UI arrangment" into pi-dev
am: c22bada88a

Change-Id: I3f02057b6c7faa902a6832f4ac8dc878e67ac786

6 years agoMerge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 23:35:15 +0000 (23:35 +0000)]
Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev

6 years agoMerge "Shuffle sound settings UI arrangment" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 23:16:28 +0000 (23:16 +0000)]
Merge "Shuffle sound settings UI arrangment" into pi-dev

6 years agoMerge "Use a different string for vpn summary." into pi-dev
Doris Ling [Thu, 12 Apr 2018 23:08:57 +0000 (16:08 -0700)]
Merge "Use a different string for vpn summary." into pi-dev
am: a9261b4136

Change-Id: If11353a90933436bb1a2425e418369fc75d8a1ad

6 years agoMerge "Use a different string for vpn summary." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 22:26:54 +0000 (22:26 +0000)]
Merge "Use a different string for vpn summary." into pi-dev

6 years agoMerge "Notification summary updates" into pi-dev
Julia Reynolds [Thu, 12 Apr 2018 22:24:29 +0000 (15:24 -0700)]
Merge "Notification summary updates" into pi-dev
am: 81c15c05c8

Change-Id: I110a4696b24a7fc58ced05f15a6b9c2728c7247c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 12 Apr 2018 22:16:40 +0000 (15:16 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Bug: 77897542
Change-Id: Ibe6564030f06ca559f4f4353c88746b8ab775da7

6 years agoShuffle sound settings UI arrangment
ryanywlin [Thu, 12 Apr 2018 21:51:46 +0000 (05:51 +0800)]
Shuffle sound settings UI arrangment

- Move "Ring volume" and "also viberate for calls" below to "Media volume"
- Add divider between "Media volume" and "Ring volume"
- Add divider between "also viberate for calls" and "Alarm volume"

Bug: 74130772
Test: rebuild
Change-Id: Ie274c0174d828a0804b8551760c407579585bd1b

6 years agoUse a different string for vpn summary.
Doris Ling [Thu, 12 Apr 2018 21:04:10 +0000 (14:04 -0700)]
Use a different string for vpn summary.

- for legacy vpn config, we do not get the vpn name to show in the
preference summary, and we used to simply show "Connected" as the summary
text. However, the string was changed to include the connected device
name as the parameter. Change to use connected summary string that does
not requires any parameter.

Change-Id: Ia6191eb315f5f23e0e6bf8da2a9537c211e8188e
Fixes: 77618408
Test: make RunSettingsRoboTests

6 years agoMerge changes from topic "anomaly_system_app" into pi-dev
Lei Yu [Thu, 12 Apr 2018 20:52:42 +0000 (13:52 -0700)]
Merge changes from topic "anomaly_system_app" into pi-dev
am: dc8fff76f3

Change-Id: Icd9367fc1d43ce535fbd296f71f024ff68389eaa

6 years agoMerge "Notification summary updates" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 20:43:10 +0000 (20:43 +0000)]
Merge "Notification summary updates" into pi-dev

6 years agoMerge "Implement previously connected device UI" into pi-dev
hughchen [Thu, 12 Apr 2018 20:40:02 +0000 (13:40 -0700)]
Merge "Implement previously connected device UI" into pi-dev
am: 3e644756c3

Change-Id: I69c161005b7ec39fddc0e9784d41a6b5dac11d6d

6 years agoMerge "Refactor airplane mode preference controller." into pi-dev
CY Cheng [Thu, 12 Apr 2018 19:09:34 +0000 (12:09 -0700)]
Merge "Refactor airplane mode preference controller." into pi-dev
am: 0375bbc709

Change-Id: I63f97d6ad20cd0e4191d5d14559046ccfc6baf89

6 years agoMerge changes from topic "anomaly_system_app" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 18:50:23 +0000 (18:50 +0000)]
Merge changes from topic "anomaly_system_app" into pi-dev

* changes:
  Add method to check if app has launcher activity
  Add system app check for anomaly detection.

6 years agoMerge "Implement previously connected device UI" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 18:23:58 +0000 (18:23 +0000)]
Merge "Implement previously connected device UI" into pi-dev

6 years agoMerge "Uniquely identify Slice intents" into pi-dev
Matthew Fritze [Thu, 12 Apr 2018 17:55:15 +0000 (10:55 -0700)]
Merge "Uniquely identify Slice intents" into pi-dev
am: 45b6a9498c

Change-Id: I92b23fdb335364c3c5f5a7e5fb7c2936a7ec1b33

6 years agoNotification summary updates
Julia Reynolds [Thu, 12 Apr 2018 16:24:25 +0000 (12:24 -0400)]
Notification summary updates

- Fix app info summary
- Add configure notifications summary

Test: make -j RunSettingsRoboTests
Change-Id: Ic3c3036ee903fe7403032925a8145693807793d5
Fixes: 77598357
Fixes: 73018368

6 years agoMerge "Refactor airplane mode preference controller." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 17:44:04 +0000 (17:44 +0000)]
Merge "Refactor airplane mode preference controller." into pi-dev

6 years agoMerge "Uniquely identify Slice intents" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 17:38:52 +0000 (17:38 +0000)]
Merge "Uniquely identify Slice intents" into pi-dev

6 years agoImplement previously connected device UI
hughchen [Tue, 3 Apr 2018 08:15:03 +0000 (16:15 +0800)]
Implement previously connected device UI

* Move save device group to "Previously connected devices"

Bug: 74134939
Test: make -j60 RunSettingsRoboTests
Change-Id: Iff7894033df402d42dcc0ccaea6db3106edb7013
Merged-In: Iff7894033df402d42dcc0ccaea6db3106edb7013

6 years agoAdd method to check if app has launcher activity
Lei Yu [Tue, 10 Apr 2018 21:38:46 +0000 (14:38 -0700)]
Add method to check if app has launcher activity

This method should only used for system apps.

Change-Id: Id4109d8e223933269b8dae3aaa91b8a9186c527c
Fixes: 77477987
Test: RunSettingsRoboTests

6 years agoMerge "Update the action for early warning tip." into pi-dev
Lei Yu [Thu, 12 Apr 2018 10:18:30 +0000 (03:18 -0700)]
Merge "Update the action for early warning tip." into pi-dev
am: e6750d6c2d

Change-Id: Iec30d5c2d9bc5f8e6065edb60a37e7cec35f1e65

6 years agoMerge "Update the action for early warning tip." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 10:13:20 +0000 (10:13 +0000)]
Merge "Update the action for early warning tip." into pi-dev

6 years agoMerge "Shorten the strings in time zone picker menu" into pi-dev
Victor Chang [Thu, 12 Apr 2018 09:46:59 +0000 (02:46 -0700)]
Merge "Shorten the strings in time zone picker menu" into pi-dev
am: ee0679bb35

Change-Id: I9d587a9442dd3cabfab7ff95f6bf07d031341bed

6 years agoMerge "Shorten the strings in time zone picker menu" into pi-dev
Victor Chang [Thu, 12 Apr 2018 09:36:38 +0000 (09:36 +0000)]
Merge "Shorten the strings in time zone picker menu" into pi-dev

6 years agoRefactor airplane mode preference controller.
CY Cheng [Mon, 26 Mar 2018 10:38:59 +0000 (18:38 +0800)]
Refactor airplane mode preference controller.

- Convert inheritance from AbstractPreferenceController to
TogglePreferenceController.
- Register AirplaneModePreferenceController in XML.
- Decouple AirplaneModeEnabler with preference, leave the UI be
controled by PreferenceController.
- Add RoboTests test cases for AirplaneModePreferenceController.

Fixes: 67997339
Test: RunSettingsRoboTests
Change-Id: I7398943ed51345e014ee7aa774bfae1ca28632f1

6 years agoMerge "Update battery settings strings" into pi-dev
Lei Yu [Thu, 12 Apr 2018 03:33:21 +0000 (20:33 -0700)]
Merge "Update battery settings strings" into pi-dev
am: 17a463130e

Change-Id: I88ad1ad03b8fb00cfa3a31d7a913b810b38a2cfa

6 years agoMerge "Update battery settings strings" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 03:22:43 +0000 (03:22 +0000)]
Merge "Update battery settings strings" into pi-dev

6 years agoSwitch from SI to IEC unit when formatting data usage bytes
Fan Zhang [Wed, 11 Apr 2018 20:59:12 +0000 (13:59 -0700)]
Switch from SI to IEC unit when formatting data usage bytes

- Created a new helper method DataUsageUtils.formatDataUsage() to
  format data usage bytes using IEC formatting.
- Switch from Formatter.formatFileSize() to DataUsageUtils.formatDataUsage()
  everywhere in datausage package.

Change-Id: I9323beed8bf5126b153fc9a3cdd9591c97ca6fd2
Merged-In: I9323beed8bf5126b153fc9a3cdd9591c97ca6fd2
Fixes: 76159924
Test: robotests

6 years agoMerge "Add ui tests for restrict app tips" into pi-dev
Lei Yu [Thu, 12 Apr 2018 01:08:59 +0000 (18:08 -0700)]
Merge "Add ui tests for restrict app tips" into pi-dev
am: 79580c94a7

Change-Id: I87a25d00eaf8691d3318c67cce8734cf08eee4ae

6 years agoAdd system app check for anomaly detection.
Lei Yu [Tue, 10 Apr 2018 17:54:33 +0000 (10:54 -0700)]
Add system app check for anomaly detection.

In this CL, don't blame system app in anomaly detection and also
add log for it.

Following CL will update it to also check whether this system app
has launch entry.

Bug: 77477987
Test: RunSettingsRoboTests
Change-Id: I97490b32bc42ec2f8e03ec2d82f7c8bf89f9c66f

6 years agoUniquely identify Slice intents
Matthew Fritze [Tue, 10 Apr 2018 19:35:09 +0000 (12:35 -0700)]
Uniquely identify Slice intents

PendingIntents were being cached because they had the same
targets and would not differentiate on extras - thus all Slice
intents would go to the same destination as the first intent fired.

Adding the data stops the system from caching the intents.

Change-Id: Ifccab72ed482e22750422c5c36aa6d205c20ae3d
Fixes: 77650727
Test: robotests

6 years agoUpdate battery settings strings
Lei Yu [Mon, 9 Apr 2018 21:35:12 +0000 (14:35 -0700)]
Update battery settings strings

1. Change "screenTime" to "lastFullChargeTime" in high usage dialog
2. Update "Background restriction" strings
3. Update footer string

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I07c149123c4ee1a69dd81c9a9e6eaa5df69b60b4

6 years agoMerge "Add ui tests for restrict app tips" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 00:24:31 +0000 (00:24 +0000)]
Merge "Add ui tests for restrict app tips" into pi-dev

6 years agoMerge "Fix landscape pattern enroll crash" into pi-dev
Maurice Lam [Wed, 11 Apr 2018 23:56:21 +0000 (16:56 -0700)]
Merge "Fix landscape pattern enroll crash" into pi-dev
am: e20f8934c9

Change-Id: I9969382a8d2bb28719537fe6c5db5f5bc9b3f5a0

6 years agoMerge "Fix landscape pattern enroll crash" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 23:43:54 +0000 (23:43 +0000)]
Merge "Fix landscape pattern enroll crash" into pi-dev

6 years agoMerge "Add disabled checkbox preference" into pi-dev
Julia Reynolds [Wed, 11 Apr 2018 23:20:49 +0000 (16:20 -0700)]
Merge "Add disabled checkbox preference" into pi-dev
am: ccdecc664c

Change-Id: I7f733b647c94011d6fef49fa84267856f570c3e9

6 years agoAdds video to swipe up gesture
Mehdi Alizadeh [Wed, 11 Apr 2018 23:10:06 +0000 (16:10 -0700)]
Adds video to swipe up gesture
am: a37c5b26a2

Change-Id: I603ab692396126db4993c2e72969da26a122ad32

6 years agoMerge "Add disabled checkbox preference" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 23:07:40 +0000 (23:07 +0000)]
Merge "Add disabled checkbox preference" into pi-dev

6 years agoUpdate the action for early warning tip.
Lei Yu [Wed, 11 Apr 2018 22:10:36 +0000 (15:10 -0700)]
Update the action for early warning tip.

Add action to open the battery saver page when it shows "battery saver
is on".

Change-Id: Ia0536e7ef73271aefbd95e938d6f91f359a116d2
Fixes: 77874407
Test: RunSettingsRoboTests

6 years agoAdds video to swipe up gesture
Mehdi Alizadeh [Thu, 5 Apr 2018 00:28:55 +0000 (17:28 -0700)]
Adds video to swipe up gesture

Bug: 77549883
Test: Manual test
Change-Id: I818a5952864cd1a7b62501bb23ed15b4c9fabd27

6 years agoMerge "Add more slices to settings" into pi-dev
Jason Monk [Wed, 11 Apr 2018 22:29:52 +0000 (15:29 -0700)]
Merge "Add more slices to settings" into pi-dev
am: 6be11cc48b

Change-Id: Ia2783879db2a8e171c5ad963dc98a2232a23b16b

6 years agoMerge "Add more slices to settings" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 22:01:25 +0000 (22:01 +0000)]
Merge "Add more slices to settings" into pi-dev

6 years agoMerge "Update mSortOrder when changed to frequent" into pi-dev
Beverly [Wed, 11 Apr 2018 21:15:10 +0000 (14:15 -0700)]
Merge "Update mSortOrder when changed to frequent" into pi-dev
am: 50fdc109ff

Change-Id: I4b88ae1c396ea15ce9450eaf80a233919e91e85e

6 years agoMerge "Update mSortOrder when changed to frequent" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 21:05:50 +0000 (21:05 +0000)]
Merge "Update mSortOrder when changed to frequent" into pi-dev

6 years agoMerge "String changes for suppressing ambient display" into pi-dev
Julia Reynolds [Wed, 11 Apr 2018 19:57:35 +0000 (12:57 -0700)]
Merge "String changes for suppressing ambient display" into pi-dev
am: eaccf907e7

Change-Id: I273ec57ff68b671ced243417e1b0976e6d0fee20

6 years agoMerge "Stop logging hotspot password change in logcat." into pi-dev
Fan Zhang [Wed, 11 Apr 2018 19:47:04 +0000 (12:47 -0700)]
Merge "Stop logging hotspot password change in logcat." into pi-dev
am: 3441c3b073

Change-Id: I57895081d30566cf12519d25543ab3c5e4632d60

6 years agoMerge "Adds the Swipe Up settings page under gestures" into pi-dev
Mehdi Alizadeh [Wed, 11 Apr 2018 19:45:47 +0000 (12:45 -0700)]
Merge "Adds the Swipe Up settings page under gestures" into pi-dev
am: cb5899f72e

Change-Id: I5a0d9cd0b377e3012691b0f534e020a3a0034014

6 years agoMerge "String changes for suppressing ambient display" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 19:37:25 +0000 (19:37 +0000)]
Merge "String changes for suppressing ambient display" into pi-dev

6 years agoMerge "Stop logging hotspot password change in logcat." into pi-dev
Fan Zhang [Wed, 11 Apr 2018 19:21:20 +0000 (19:21 +0000)]
Merge "Stop logging hotspot password change in logcat." into pi-dev

6 years agoMerge "Adds the Swipe Up settings page under gestures" into pi-dev
Mehdi Alizadeh [Wed, 11 Apr 2018 19:07:31 +0000 (19:07 +0000)]
Merge "Adds the Swipe Up settings page under gestures" into pi-dev

6 years agoMerge "Badge the icon properly in policy transparency dialog" into pi-dev
Tony Mak [Wed, 11 Apr 2018 18:59:30 +0000 (11:59 -0700)]
Merge "Badge the icon properly in policy transparency dialog" into pi-dev
am: df68a76e33

Change-Id: I751c5ad1654279c11775cb9fc1dd9bfcefdcaed7

6 years agoUpdate mSortOrder when changed to frequent
Beverly [Tue, 10 Apr 2018 20:29:40 +0000 (16:29 -0400)]
Update mSortOrder when changed to frequent

Update mSortOrder so when the activity is resumed, the
apps are sorted how the user wants

Test: make ROBOTEST_FILTER=ManageApplicationsTest RunSettingsRoboTests
Change-Id: I422846aada29ee254996b2e94da27af7ed935a0b
Fixes: 77691626

6 years agoMerge "Badge the icon properly in policy transparency dialog" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 18:16:29 +0000 (18:16 +0000)]
Merge "Badge the icon properly in policy transparency dialog" into pi-dev

6 years agoMerge "Fuelgauge handle StatsManager Exception API" into pi-dev
Bookatz [Wed, 11 Apr 2018 18:06:27 +0000 (11:06 -0700)]
Merge "Fuelgauge handle StatsManager Exception API" into pi-dev
am: f142ace1d0

Change-Id: I72b975c5e57a96fc02ff318bb0ad4e77410dfcd0

6 years agoAdd more slices to settings
Jason Monk [Tue, 3 Apr 2018 18:43:25 +0000 (14:43 -0400)]
Add more slices to settings

Test: open settings
Bug: 74555610
Change-Id: I061685342f61a6a43670b7f3378d2a6918bcf495

6 years agoAdds the Swipe Up settings page under gestures
Mehdi Alizadeh [Wed, 4 Apr 2018 01:51:07 +0000 (18:51 -0700)]
Adds the Swipe Up settings page under gestures

The illusteration video is not included yet.

Merged-In: I7f2b2f3251a795dfd74dbbb442692e42a5a2966e
Bug: 77549883
Test: Unit tests and Manual test
Change-Id: I04f01f0814f16e4e006291e61ddb07cea8e7c0d6

6 years agoAdd ui tests for restrict app tips
Lei Yu [Wed, 11 Apr 2018 17:38:04 +0000 (10:38 -0700)]
Add ui tests for restrict app tips

Add anomaly data to database then check whether it shows correct
data in settings UI.

We can also use this test to trigger anomalies and test it manually.

Change-Id: Ic4bbe3de1e828415b9b3f1180cbb41c737b43232
Fixes: 77477035
Test: atest SettingsUnitTest

6 years agoAdd disabled checkbox preference
Julia Reynolds [Wed, 11 Apr 2018 13:49:52 +0000 (09:49 -0400)]
Add disabled checkbox preference

A checkbox preference that users can't change, but with non-disabled
test for legibilty.

Test: make -j RunSettingsRoboTests
Bug: 77657376
Change-Id: Iea9bbcc5efbf80cbc380fb8d5a360fe8386889a0

6 years agoStop logging hotspot password change in logcat.
Fan Zhang [Wed, 11 Apr 2018 17:32:16 +0000 (10:32 -0700)]
Stop logging hotspot password change in logcat.

Change-Id: I705ec6413cef8e8435c9020d8b7434f8e641b0d4
Fixes: 77880733
Test: rebuild

6 years agoMerge "Fuelgauge handle StatsManager Exception API" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 17:02:06 +0000 (17:02 +0000)]
Merge "Fuelgauge handle StatsManager Exception API" into pi-dev

6 years agoShorten the strings in time zone picker menu
Victor Chang [Wed, 11 Apr 2018 16:52:01 +0000 (17:52 +0100)]
Shorten the strings in time zone picker menu

Bug: 77641819
Test: manual
Change-Id: Ie87e83cf0b04f5c4fb8cfb999b2842209dc13e3e

6 years agoMerge "Do not set separate challenge flag before clearing lock" into pi-dev
Rubin Xu [Wed, 11 Apr 2018 16:14:10 +0000 (09:14 -0700)]
Merge "Do not set separate challenge flag before clearing lock" into pi-dev
am: a9fea25929

Change-Id: Ifc079c0aa27867e9dde1c3b9b406944875330256

6 years agoMerge "Do not set separate challenge flag before clearing lock" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:00:59 +0000 (16:00 +0000)]
Merge "Do not set separate challenge flag before clearing lock" into pi-dev

6 years agoBadge the icon properly in policy transparency dialog
Tony Mak [Wed, 11 Apr 2018 11:40:08 +0000 (12:40 +0100)]
Badge the icon properly in policy transparency dialog

Following the pattern used within the Settings app to badge the icon.

For location setting, the dialog is shown in work profile user.
Thus ai.loadIcon badged the icon for the first time and
getUserBadgedIcon baged the second time.

Fixes: 77844928
Test: adb shell wm density 560 -> suspend an app -> launch the app ->
      observe the dialog. Repeat the test with original density.

Change-Id: Ie79c3d9aa7b1a155edc74816850b1349fbd2d606

6 years agoMerge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
timhypeng [Wed, 11 Apr 2018 13:37:02 +0000 (06:37 -0700)]
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
am: ca67fbfea5

Change-Id: Ie85e5290a101d83a97a0f98a90249b11d9b6d6f5

6 years agoString changes for suppressing ambient display
Julia Reynolds [Wed, 11 Apr 2018 13:27:30 +0000 (09:27 -0400)]
String changes for suppressing ambient display

Test: make
Bug: 77657376
Change-Id: I7c2795291a82a885a26a0af598bdafb96842d998

6 years agoMerge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 13:17:26 +0000 (13:17 +0000)]
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev

6 years agoDo not set separate challenge flag before clearing lock
Rubin Xu [Wed, 11 Apr 2018 10:43:18 +0000 (11:43 +0100)]
Do not set separate challenge flag before clearing lock

This step is redundant since clearLock() would set the flag internally anyway.
In fact setting the flag before calling clearLock() is wrong since it will
lead LockSettingsService.setLockCredential() to think that the target profile
does not have a unified challenge, causing it to use an incorrect existing
credential for password change, leading to untrusted credential change.

Bug: 77892111
Test: Create profile; set separate empty work challenge; observe no crash
Change-Id: I4d76b20706a796654f9389f31ae8c46d51d7adac

6 years agoMerge "[Settings] Align volume slider with other preference" into pi-dev
caxtonchan [Wed, 11 Apr 2018 03:32:07 +0000 (20:32 -0700)]
Merge "[Settings] Align volume slider with other preference" into pi-dev
am: b86e8cadd9

Change-Id: I54ef4b779672eaae825b2d291d1720df2a2ed3d0

6 years agoMerge "[Settings] Align volume slider with other preference" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 03:11:06 +0000 (03:11 +0000)]
Merge "[Settings] Align volume slider with other preference" into pi-dev

6 years agoFix landscape pattern enroll crash
Maurice Lam [Wed, 11 Apr 2018 02:53:41 +0000 (19:53 -0700)]
Fix landscape pattern enroll crash

Test: atest SetupChooseLockPatternTest.java
Bug: 77878150
Change-Id: Ie54286765ea0d766bcc9e2c8e56cfbda919d5fd7

6 years agoMerge "Convert auto-brightness switch to a full screen UI." into pi-dev
Fan Zhang [Wed, 11 Apr 2018 01:41:36 +0000 (18:41 -0700)]
Merge "Convert auto-brightness switch to a full screen UI." into pi-dev
am: 16594545ff

Change-Id: I29f445292f789dd564cda99c0d5de95d1ed99ee2

6 years agoMerge "Change string" into pi-dev
hughchen [Wed, 11 Apr 2018 01:40:46 +0000 (18:40 -0700)]
Merge "Change string" into pi-dev
am: 30d3c49329

Change-Id: I7aed24faa5303eda4f2b9d45fcf557737e5337ce

6 years agoMerge "Convert auto-brightness switch to a full screen UI." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 01:28:33 +0000 (01:28 +0000)]
Merge "Convert auto-brightness switch to a full screen UI." into pi-dev

6 years agoMerge "Change string" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 01:24:08 +0000 (01:24 +0000)]
Merge "Change string" into pi-dev

6 years agoFuelgauge handle StatsManager Exception API
Bookatz [Wed, 11 Apr 2018 00:40:42 +0000 (17:40 -0700)]
Fuelgauge handle StatsManager Exception API

StatsManager now returns Exceptions for certain errors, instead of
returning a boolean. Thus Fuelgauge needs to be updated.

Bug: 77648233
Test: make ROBOTEST_FILTER=AnomalyConfigJobServiceTest RunSettingsRoboTests
Change-Id: I7160ac01141c673c90e33423220dc888a2710340

6 years agoMerge "Prevent ringing updates" into pi-dev
Julia Reynolds [Tue, 10 Apr 2018 23:00:22 +0000 (16:00 -0700)]
Merge "Prevent ringing updates" into pi-dev
am: dbffb1812d

Change-Id: I119e70461080de521e590e7ffb138184978f4d79

6 years agoMerge "Protect against invalid authority in account sync pref." into pi-dev
Fan Zhang [Tue, 10 Apr 2018 22:59:23 +0000 (15:59 -0700)]
Merge "Protect against invalid authority in account sync pref." into pi-dev
am: 2c15909bfc

Change-Id: I8639c271a60462516ae9639ad237081572df4135

6 years agoMerge "Prevent ringing updates" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:52:10 +0000 (22:52 +0000)]
Merge "Prevent ringing updates" into pi-dev

6 years agoMerge "Protect against invalid authority in account sync pref." into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:49:18 +0000 (22:49 +0000)]
Merge "Protect against invalid authority in account sync pref." into pi-dev

6 years agoMerge "Remove provisioning dialog from wifi-tethering" into pi-dev
Salvador Martinez [Tue, 10 Apr 2018 22:22:13 +0000 (15:22 -0700)]
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev
am: 4eeb88ab8a

Change-Id: I9d9716bec63e0d7361eebc8f984e655031849976

6 years agoMerge "Set parent for auto zen rules to be zen rule page" into pi-dev
Beverly [Tue, 10 Apr 2018 22:18:51 +0000 (15:18 -0700)]
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
am: 45fe0bb6a0

Change-Id: Ie2e698f225ea43912621ea56f695c59f084118d0

6 years agoMerge "Marking dictionary activity as visibleToInstantApps" into pi-dev
Patrick Baumann [Tue, 10 Apr 2018 22:17:41 +0000 (15:17 -0700)]
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev
am: 0c532181ab

Change-Id: Id922f460c951685ed032f5e7d0267f27efdd3689

6 years agoMerge "Remove provisioning dialog from wifi-tethering" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:16:35 +0000 (22:16 +0000)]
Merge "Remove provisioning dialog from wifi-tethering" into pi-dev

6 years agoMerge "Set parent for auto zen rules to be zen rule page" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:09:34 +0000 (22:09 +0000)]
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev

6 years agoMerge "Marking dictionary activity as visibleToInstantApps" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:00:34 +0000 (22:00 +0000)]
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev

6 years agoPrevent ringing updates
Julia Reynolds [Tue, 10 Apr 2018 15:04:23 +0000 (11:04 -0400)]
Prevent ringing updates

- Add video
- Update text
- Link from Sound settings
- Inherit from BasePreferenceController

Test: make -j RunSettingsRoboTests
Change-Id: If8cd9efd4e6034e6f6864a142a86cbc23bf59dc3
Fixes: 76832936
Fixes: 74410634

6 years agoConvert auto-brightness switch to a full screen UI.
Fan Zhang [Tue, 10 Apr 2018 20:08:22 +0000 (13:08 -0700)]
Convert auto-brightness switch to a full screen UI.

Change-Id: Id5e5ec959201102a7c60372a441dc6813ceedbae
Merged-In: Id5e5ec959201102a7c60372a441dc6813ceedbae
Fixes: 69795935
Test: Existing conformance tests still pass (CodeInspectionTest,
      UniquePreferenceTest, manual search test)

6 years agoMerge "Add test flags for battery tips." into pi-dev
Lei Yu [Tue, 10 Apr 2018 21:02:10 +0000 (14:02 -0700)]
Merge "Add test flags for battery tips." into pi-dev
am: 93ff833316

Change-Id: Icf06d57e93992c00b19bd203bbd55d8fb19c3f12

6 years agoMerge "Add test flags for battery tips." into pi-dev
Lei Yu [Tue, 10 Apr 2018 20:44:11 +0000 (20:44 +0000)]
Merge "Add test flags for battery tips." into pi-dev

6 years agoMerge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
Matthew Fritze [Tue, 10 Apr 2018 19:38:28 +0000 (12:38 -0700)]
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
am: 3ec0e4851c

Change-Id: I6b497d1b7b9d733016f1908ae429fe493a607511

6 years agoMerge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 19:31:03 +0000 (19:31 +0000)]
Merge "Unavailable Slices includes DISABLED_DEPENDENT settings" into pi-dev

6 years agoSet parent for auto zen rules to be zen rule page
Beverly [Tue, 10 Apr 2018 19:28:17 +0000 (15:28 -0400)]
Set parent for auto zen rules to be zen rule page

Clicking the back button on an automatic zen rule
will now go back to the automatic rule page instead
of the generic Settings page

Change-Id: I5902e01b641ec3e4d0c8b4b4a5b16a0385cbd0ff
Fixes: 77833624
Test: manual

6 years agoMerge "Hide preference when no app restricted" into pi-dev
Lei Yu [Tue, 10 Apr 2018 19:03:56 +0000 (12:03 -0700)]
Merge "Hide preference when no app restricted" into pi-dev
am: 1f02712e7a

Change-Id: I6cabb95f74b21841874cb7bd710aefb04db078f0

6 years agoMerge "Hide preference when no app restricted" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 18:30:26 +0000 (18:30 +0000)]
Merge "Hide preference when no app restricted" into pi-dev

6 years agoMerge "Hide color mode preference depending on Accessibility settings" into pi-dev
Daniel Solomon [Tue, 10 Apr 2018 18:02:04 +0000 (11:02 -0700)]
Merge "Hide color mode preference depending on Accessibility settings" into pi-dev
am: e96b57a5fb

Change-Id: I0b746d7e2a8e2d06a82d3beeb2c5beb5fc79ff3b