OSDN Git Service
Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]
Merge "Add audio switch UI in sound settings" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Implement audio switch UI" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 17:14:49 +0000 (17:14 +0000)]
Merge "Remove battery usage preference in app info page" into pi-dev
Isha Bobra [Mon, 16 Apr 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev
ryanywlin [Fri, 23 Mar 2018 08:57:51 +0000 (16:57 +0800)]
Add audio switch UI in sound settings
- Build two controller to control list preferences.
- MediaOutputPreferenceController which allows switching
the media output between current device and connected
BT device supporting A2DP. It also controls disabling
media output switching during a call or cast mode.
- HandsFreeProfilePreferenceController which allows
switching between HFP-connected BT devices while in
on-call state.
- Add test cases for controllers.
Bug:
74130772
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j56
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j56
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j56
Change-Id: I37f5418442ce77e72cdff07f071ea519ab1047f3
hughchen [Fri, 23 Mar 2018 08:14:13 +0000 (16:14 +0800)]
Implement audio switch UI
* Implement available media devices group
* Add AvailableMediaDeviceGroupController to realize UI, the user can see the all device that can be activated in this group.
* ConnectedDeviceGroupController change to show the device that cannot be activated but is connected.
* Refactoring the below class, implement the controller in connected_devices.xml.
ConnectedDeviceGroupController.java
SavedDeviceGroupController.java
ConnectedDeviceDashboardFragment.java
connected_devices.xml
* Add AvailableMediaBluetoothDeviceUpdaterTest to verify the add/remove preference behavior when connectedStateChanged or profileAudioStateChanged
* Add test that used to verify device is connected or not in BluetoothDeviceUpdaterTest.
* Add test that used to verify the add/remove preference behavior when connectedStateChanged or profileAudioStateChanged in ConnectedBluetoothDeviceUpdaterTest.
* Add AvailableMediaDeviceGroupControllerTest to verify bluetooth feature is supported or not and test register callback.
* Add test that used to verify bluetooth feature is supported or not and test register callback in ConnectedDeviceGroupControllerTest.
* Add test that used to verify bluetooth feature is supported or not and test register callback in SavedDeviceGroupControllerTest
Bug:
74134939
Test: make -j40 RunSettingsRoboTests
Change-Id: I54d03c2ddadc6a4be7519dd74cdbcb5055d44083
TreeHugger Robot [Sat, 14 Apr 2018 23:12:48 +0000 (23:12 +0000)]
Merge "Register ConnectDeviceFrag with new key" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 14 Apr 2018 03:57:48 +0000 (20:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5292358d043bede11ff4791263b007d31b04d8b6
TreeHugger Robot [Sat, 14 Apr 2018 03:08:23 +0000 (03:08 +0000)]
Merge "Storage wizard string changes per UX request." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 01:36:27 +0000 (01:36 +0000)]
Merge "Update fingerprint illustration" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 01:34:34 +0000 (01:34 +0000)]
Merge "Use the correct text for DND onboarding." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 01:25:33 +0000 (01:25 +0000)]
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
Andrew Sapperstein [Sat, 14 Apr 2018 00:24:33 +0000 (17:24 -0700)]
Use the correct text for DND onboarding.
Update the screen on title to use the screen on
text instead of the screen off text.
Bug:
78019397
Test: visual inspection
Change-Id: Ie5c0b462b44ad735963c2800a59a20288b1cadf8
TreeHugger Robot [Fri, 13 Apr 2018 23:00:52 +0000 (23:00 +0000)]
Merge "Update bluetooth preference to take user to new screen" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 22:54:18 +0000 (22:54 +0000)]
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev
Isha Bobra [Fri, 9 Feb 2018 00:09:39 +0000 (16:09 -0800)]
Show only 1 entry for hearing aid devices without killing the activity.
This CL tries to detect Bluetooth hearing aid devices and tries to
combine the entry of the hearing aids with the same HiSyncIds and
show only 1 entry for each pair in the connected devices list.
This CL also shows 2 battery status in the device details page.
This change shows the combined entry after a user returns to the
settings activity after pressing the back button or somehow
without killing it. It also combines the entries just after pairing.
Test: RunSettingsRoboTests
Bug:
74204427
Change-Id: I47fb0bdd96b1cc972d88a4aef85d0113985d63bb
TreeHugger Robot [Fri, 13 Apr 2018 22:51:25 +0000 (22:51 +0000)]
Merge "Add strings for AP band UI changes" into pi-dev
Salvador Martinez [Fri, 13 Apr 2018 20:01:19 +0000 (13:01 -0700)]
Fix mistake in onActivityResult for ConfigureWifiSettings
Accidently checked the result code instead of request code when
trying to route the callback to the correct controller. This
CL fixes that.
Test: robotests still pass
Bug:
77543817
Change-Id: Ice1dd799d3f06f86743940c5202d308c21e88cdf
Salvador Martinez [Wed, 4 Apr 2018 21:23:57 +0000 (14:23 -0700)]
Update bluetooth preference to take user to new screen
This CL removes the toggle from the bluetooth preference and instead
takes users to a new dedicated screen for toggling bluetooth status.
On this screen we show a different summary text depending on whether
bluetooth and bluetooth scanning are on/off. Also, we were able to
delegate most of the UI/bluetooth handling to already existing
classes.
Test: robotests
Bug:
77543471
Merged-In: I036a3992bbd78896da8364b55ecc51afc4464b6e
Change-Id: I036a3992bbd78896da8364b55ecc51afc4464b6e
TreeHugger Robot [Fri, 13 Apr 2018 22:07:22 +0000 (22:07 +0000)]
Merge "Remove menu from Network & Internet screen." into pi-dev
Lei Yu [Fri, 13 Apr 2018 21:28:14 +0000 (14:28 -0700)]
Remove battery usage preference in app info page
Bug:
78011526
Test: RunSettingsRoboTests
Change-Id: I2dfb989167fe27857590f416fbb16d401e53bc1d
Jeff Sharkey [Fri, 13 Apr 2018 21:20:31 +0000 (15:20 -0600)]
Storage wizard string changes per UX request.
Bug:
77207119
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I93adf01442d006927c792db405d8cf73c963dd40
Salvador Martinez [Fri, 13 Apr 2018 21:19:49 +0000 (14:19 -0700)]
Add strings for AP band UI changes
This CL just adds strings needed for another change. See change with
id = Ib2d4a2834c5cd11875515d308f7b20bfc8471959
Test: just adds string
Bug:
73102003
Change-Id: Ibd0ded108f49e481d2a858960b9add48a09cc497
Andrew Sapperstein [Fri, 13 Apr 2018 20:48:05 +0000 (13:48 -0700)]
Remove menu from Network & Internet screen.
Only one item was left "reset wi-fi, mobile & bluetooth"
which is also an option in Reset. So we're just removing
it so that there's no overflow menu at all.
Change-Id: I0298192667fb4ac2f58f51232ae2da1842e6c27e
Fixes:
77986130
Test: robotests
Lifu Tang [Thu, 12 Apr 2018 17:01:29 +0000 (10:01 -0700)]
Add a wrapper Activity to launch scanning settings
GmsCore needs to start scanning settings from notification
Bug:
77823544
Test: adb shell am start -a android.settings.LOCATION_SCANNING_SETTINGS
Change-Id: Iecf1f811983068b29aa06a9985c83a5a1fb11a2a
TreeHugger Robot [Fri, 13 Apr 2018 19:44:37 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Doris Ling [Fri, 13 Apr 2018 19:44:11 +0000 (19:44 +0000)]
Merge "Hide Default apps and App permissions under Advanced." into pi-dev
Daniel Nishi [Fri, 13 Apr 2018 19:31:15 +0000 (19:31 +0000)]
Merge "Warn users before they change device name." into pi-dev
Bill Yi [Fri, 13 Apr 2018 18:39:46 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I50e29a33b46f948023f4b85d1ebacb99397d6ec9
TreeHugger Robot [Fri, 13 Apr 2018 17:48:22 +0000 (17:48 +0000)]
Merge "Support customizing icon color for externally items." into pi-dev
Lei Yu [Fri, 13 Apr 2018 16:42:08 +0000 (16:42 +0000)]
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev
Fan Zhang [Thu, 12 Apr 2018 21:04:09 +0000 (14:04 -0700)]
Support customizing icon color for externally items.
When a setting is injected to homepage, we now allow the setting
provider customize the background color for its icon.
If no custom bg color is provided, we fallback to existing behavior.
This behavior is only needed in homepage, because we don't have any
tinting logic in other pages so external setting providers can just
provide arbitrary icon.
Bug:
77188317
Test: robotests
Change-Id: I7d4b512fafc28537de46192026ce4bbe51b498c4
HJ ChangLiao [Thu, 12 Apr 2018 08:29:33 +0000 (16:29 +0800)]
Register ConnectDeviceFrag with new key
For inject dynamic pref driving mode to
ConnectDeviceDashboardFragment,
Register this frag with new key CONNECT.
Bug:
72458929
Test: make RunSettingsRoboTests
Change-Id: I41781ff2f8918f7923c53defff85ddd4afe7056d
Lei Yu [Fri, 13 Apr 2018 00:35:11 +0000 (00:35 +0000)]
Merge "Log app versionCode in anomaly detection" 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
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
TreeHugger Robot [Thu, 12 Apr 2018 23:16:28 +0000 (23:16 +0000)]
Merge "Shuffle sound settings UI arrangment" into pi-dev
Daniel Nishi [Fri, 6 Apr 2018 01:24:13 +0000 (18:24 -0700)]
Warn users before they change device name.
This ensures users know that the change they make will be visible
through Bluetooth and Wi-Fi Hotspot.
Fixes:
74981919
Test: Settings robotest
Merged-In: Ib27066f4a123dc472730d7e663adfb039b1e27d6
Doris Ling [Thu, 12 Apr 2018 22:31:32 +0000 (15:31 -0700)]
Hide Default apps and App permissions under Advanced.
- decrease the initial expand count to move the 2 items into the
Advanced section in the Apps and notification page.
Change-Id: I5861c4c768d3a4d77677c75555d83065f2526a56
Fixes:
77823915
Test: manual
TreeHugger Robot [Thu, 12 Apr 2018 22:26:54 +0000 (22:26 +0000)]
Merge "Use a different string for vpn summary." into pi-dev
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
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
Lei Yu [Thu, 12 Apr 2018 20:58:40 +0000 (13:58 -0700)]
Change "Advanced battery usage" to "Battery usage"
Also update the char limit to 25 to make it less impossible
to happen in other language.
Bug:
77649015
Test: Screenshot
Change-Id: I4cdbfc576660aacaeff019bbbb88abb42af63daa
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
TreeHugger Robot [Thu, 12 Apr 2018 20:43:10 +0000 (20:43 +0000)]
Merge "Notification summary updates" 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.
TreeHugger Robot [Thu, 12 Apr 2018 18:23:58 +0000 (18:23 +0000)]
Merge "Implement previously connected device UI" into pi-dev
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
TreeHugger Robot [Thu, 12 Apr 2018 17:44:04 +0000 (17:44 +0000)]
Merge "Refactor airplane mode preference controller." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 17:38:52 +0000 (17:38 +0000)]
Merge "Uniquely identify Slice intents" into pi-dev
Lei Yu [Thu, 12 Apr 2018 02:53:53 +0000 (19:53 -0700)]
Log app versionCode in anomaly detection
Change-Id: Ie760a4156b14b739279aa398bd1d2b8485449e91
Fixes:
77919142
Test: RunSettingsRoboTests
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
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
TreeHugger Robot [Thu, 12 Apr 2018 10:13:20 +0000 (10:13 +0000)]
Merge "Update the action for early warning tip." 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
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
TreeHugger Robot [Thu, 12 Apr 2018 03:22:43 +0000 (03:22 +0000)]
Merge "Update battery settings strings" into pi-dev
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
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
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
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
TreeHugger Robot [Thu, 12 Apr 2018 00:24:31 +0000 (00:24 +0000)]
Merge "Add ui tests for restrict app tips" 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
TreeHugger Robot [Wed, 11 Apr 2018 23:07:40 +0000 (23:07 +0000)]
Merge "Add disabled checkbox preference" into pi-dev
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
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
TreeHugger Robot [Wed, 11 Apr 2018 22:01:25 +0000 (22:01 +0000)]
Merge "Add more slices to settings" 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
TreeHugger Robot [Wed, 11 Apr 2018 19:37:25 +0000 (19:37 +0000)]
Merge "String changes for suppressing ambient display" 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
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
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
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
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
Maurice Lam [Wed, 11 Apr 2018 00:16:53 +0000 (17:16 -0700)]
Update fingerprint illustration
Test: Manual
Bug:
74410378
Bug:
74410267
Change-Id: I8ef052ea7f1cd6406001d383cab5825ed8f6d5f5
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
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
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
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
TreeHugger Robot [Wed, 11 Apr 2018 17:02:06 +0000 (17:02 +0000)]
Merge "Fuelgauge handle StatsManager Exception API" into pi-dev
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
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
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
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
TreeHugger Robot [Wed, 11 Apr 2018 13:17:26 +0000 (13:17 +0000)]
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
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
TreeHugger Robot [Wed, 11 Apr 2018 03:11:06 +0000 (03:11 +0000)]
Merge "[Settings] Align volume slider with other preference" into pi-dev
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
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
TreeHugger Robot [Wed, 11 Apr 2018 01:24:08 +0000 (01:24 +0000)]
Merge "Change string" into pi-dev
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
TreeHugger Robot [Tue, 10 Apr 2018 22:52:10 +0000 (22:52 +0000)]
Merge "Prevent ringing updates" 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
TreeHugger Robot [Tue, 10 Apr 2018 22:16:35 +0000 (22:16 +0000)]
Merge "Remove provisioning dialog from wifi-tethering" 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
TreeHugger Robot [Tue, 10 Apr 2018 22:00:34 +0000 (22:00 +0000)]
Merge "Marking dictionary activity as visibleToInstantApps" into pi-dev
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
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)
Lei Yu [Tue, 10 Apr 2018 20:44:11 +0000 (20:44 +0000)]
Merge "Add test flags for battery tips." into pi-dev