OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Fix text alignment with rtl languages in entity header." into pi-dev
Fan Zhang [Tue, 17 Apr 2018 23:04:15 +0000 (16:04 -0700)]
Merge "Fix text alignment with rtl languages in entity header." into pi-dev
am: 7298297007

Change-Id: Ifa6e23aa7a5ea12309793b82c2c1a0056b45601f

6 years agoMerge "Update icon for security settings." into pi-dev
Doris Ling [Tue, 17 Apr 2018 23:03:05 +0000 (16:03 -0700)]
Merge "Update icon for security settings." into pi-dev
am: 3e3b496738

Change-Id: I8c2be3da00c85ac0e1a901d66ed3dfb42e82202a

6 years agoMerge "Fix text alignment with rtl languages in entity header." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 22:51:07 +0000 (22:51 +0000)]
Merge "Fix text alignment with rtl languages in entity header." into pi-dev

6 years agoMerge "Update icon for security settings." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 22:33:26 +0000 (22:33 +0000)]
Merge "Update icon for security settings." into pi-dev

6 years agoDisable autofill on choose password layout
Fan Zhang [Tue, 17 Apr 2018 22:13:40 +0000 (15:13 -0700)]
Disable autofill on choose password layout
am: 014ed74845

Change-Id: Ibb71a14a55ef0acc304ef3730d6e89bd2f5492e7

6 years agoUpdate icon for security settings.
Doris Ling [Tue, 17 Apr 2018 19:26:33 +0000 (12:26 -0700)]
Update icon for security settings.

- also fix the issue of dynamic tile icon is being cached and not
updated properly.

Change-Id: I9289260340c1cddc4123fda88c366d658a11ddfc
Fixes: 74255242
Test: visual

6 years agoFix text alignment with rtl languages in entity header.
Fan Zhang [Tue, 17 Apr 2018 21:30:08 +0000 (14:30 -0700)]
Fix text alignment with rtl languages in entity header.

TextViews should align at viewStart to make numerics like version
number display in RTL format.

Also cleaned up style so we can share the same style on all entity
header textviews.

Change-Id: I25a93d33e9fb95a9eba7b368438cb33bb67a434a
Fixes: 78173905
Test: visual

6 years agoMerge "Add getDescendants to Settings Slice Provider" into pi-dev
Matthew Fritze [Tue, 17 Apr 2018 20:53:33 +0000 (13:53 -0700)]
Merge "Add getDescendants to Settings Slice Provider" into pi-dev
am: 1257466d0b

Change-Id: I5c3c1fa93beb2654f56777ff1f4e0a0c35d27f6b

6 years agoDisable autofill on choose password layout
Fan Zhang [Tue, 17 Apr 2018 20:33:41 +0000 (13:33 -0700)]
Disable autofill on choose password layout

Change-Id: I5f09282cfa07c546172d0921e02db98b4b4c2fff
Fixes: 78173714
Test: manual

6 years agoMerge "Get rid of charging sounds toggle" into pi-dev
Beverly [Tue, 17 Apr 2018 20:31:32 +0000 (13:31 -0700)]
Merge "Get rid of charging sounds toggle" into pi-dev
am: adec029f70

Change-Id: Ied1d520e4119e5a33126d14624865de56456b7bf

6 years agoMerge "Add getDescendants to Settings Slice Provider" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 19:21:20 +0000 (19:21 +0000)]
Merge "Add getDescendants to Settings Slice Provider" into pi-dev

6 years agoMerge "Get rid of charging sounds toggle" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 19:13:11 +0000 (19:13 +0000)]
Merge "Get rid of charging sounds toggle" into pi-dev

6 years agoMerge "Update a Slice Uri when unavailable" into pi-dev
Matthew Fritze [Tue, 17 Apr 2018 19:01:02 +0000 (12:01 -0700)]
Merge "Update a Slice Uri when unavailable" into pi-dev
am: 1ee83ac460

Change-Id: I30b6c083af547ca5f0fffb7a8797adba5b89d9a3

6 years agoMerge "Update a Slice Uri when unavailable" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 18:45:39 +0000 (18:45 +0000)]
Merge "Update a Slice Uri when unavailable" into pi-dev

6 years agoMerge "Remove empty_search_image from Settings." into pi-dev
Fan Zhang [Tue, 17 Apr 2018 18:42:57 +0000 (11:42 -0700)]
Merge "Remove empty_search_image from Settings." into pi-dev
am: aac0198923

Change-Id: If0b4c9c6d37f0a9e0160ff5d59e60d1aa02ae1a3

6 years agoMerge "Remove empty_search_image from Settings." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 18:24:33 +0000 (18:24 +0000)]
Merge "Remove empty_search_image from Settings." into pi-dev

6 years agoMerge "Show suppression msg under ringer slider" into pi-dev
Julia Reynolds [Tue, 17 Apr 2018 17:51:18 +0000 (10:51 -0700)]
Merge "Show suppression msg under ringer slider" into pi-dev
am: 68f331d452

Change-Id: I0715773ec67f5f0cb18dd23a1cadf42ccc43a9d7

6 years agoAdd getDescendants to Settings Slice Provider
Matthew Fritze [Tue, 27 Mar 2018 00:30:20 +0000 (17:30 -0700)]
Add getDescendants to Settings Slice Provider

getDescendants allows another app to collect a list
of all valid Uris for Settings Slices. Important for search,
assistant or launcher apps.

This means searching our database for all valid keys and building
a list of Uris for each of those keys.

Fixes: 77808328
Test: robotests
Change-Id: I3ae27e4661a7dcaab50b091ae2730013118af8a2

6 years agoUpdate a Slice Uri when unavailable
Matthew Fritze [Thu, 12 Apr 2018 23:40:07 +0000 (16:40 -0700)]
Update a Slice Uri when unavailable

When a slice becomes unavailable, it should not update the
underlying data even if the view has not changed.

When we receive a change from an unavailable slice, notifychange
on the Uri and do not change the underlying data.

Change-Id: I91851ab668e4aece669fd65c14e0dc4ec2edefdf
Fixes: 77980406
Test: robotests

6 years agoMerge "Show suppression msg under ringer slider" into pi-dev
Julia Reynolds [Tue, 17 Apr 2018 17:37:06 +0000 (17:37 +0000)]
Merge "Show suppression msg under ringer slider" into pi-dev

6 years agoRemove empty_search_image from Settings.
Fan Zhang [Tue, 17 Apr 2018 17:15:51 +0000 (10:15 -0700)]
Remove empty_search_image from Settings.

The image now lives in SettingsIntelligence. Having another copy here
creates deadweight and confusion.

Bug: 74410371
Test: rebuild
Change-Id: Id90fd412a629fcd663cd88cbe5da46e511055adc

6 years agoMerge "Settings: Add synonyms to display cutout emulation setting" into pi-dev
Adrian Roos [Tue, 17 Apr 2018 17:03:47 +0000 (10:03 -0700)]
Merge "Settings: Add synonyms to display cutout emulation setting" into pi-dev
am: fb04d4acf7

Change-Id: I320ed9af17ae1a5b0a5b0a13114ae03d4036921c

6 years agoMerge "Settings: Add synonyms to display cutout emulation setting" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 16:43:31 +0000 (16:43 +0000)]
Merge "Settings: Add synonyms to display cutout emulation setting" into pi-dev

6 years agoSettings: Add synonyms to display cutout emulation setting
Adrian Roos [Tue, 17 Apr 2018 15:22:05 +0000 (17:22 +0200)]
Settings: Add synonyms to display cutout emulation setting

Test: Search for "notch" or "display cutout", verify emulation setting shows up
Change-Id: Iaf036c965c233e63d9cc9729a0ecd13d8e6a8881
Fixes: 78163992

6 years agoShow suppression msg under ringer slider
Julia Reynolds [Tue, 17 Apr 2018 13:11:43 +0000 (09:11 -0400)]
Show suppression msg under ringer slider

Instead of replacing the rigner slider, because the stream
isn't actually muted.

Change-Id: Id2c60d6c570084ed8febcaeb3b096a487f572312
Fixes: 77641315
Test: robotests

6 years agoRemove swipe up setting page if the feature is not available
Mehdi Alizadeh [Tue, 17 Apr 2018 02:23:39 +0000 (19:23 -0700)]
Remove swipe up setting page if the feature is not available
am: e848603807

Change-Id: I915ca786a1af7938e32e28d53468dec1584d5493

6 years agoMerge "Use the SSID of the network in the no internet dialog" into pi-dev
Chalard Jean [Tue, 17 Apr 2018 02:18:00 +0000 (19:18 -0700)]
Merge "Use the SSID of the network in the no internet dialog" into pi-dev
am: 031bee8e6e

Change-Id: I1b437e107541f9789eb9e27461f8bb8a6874e997

6 years agoRemove swipe up setting page if the feature is not available
Mehdi Alizadeh [Thu, 12 Apr 2018 21:08:12 +0000 (14:08 -0700)]
Remove swipe up setting page if the feature is not available

Bug: 77974864
Test: Manual test and RoboTests
Change-Id: Ie23a01f254d65e5888f91b5b1cb80df40976c569

6 years agoMerge "Use the SSID of the network in the no internet dialog" into pi-dev
Chalard Jean [Tue, 17 Apr 2018 02:01:02 +0000 (02:01 +0000)]
Merge "Use the SSID of the network in the no internet dialog" into pi-dev

6 years agoMerge "Fixed ApnEditor crash issue" into pi-dev
Pengquan Meng [Tue, 17 Apr 2018 01:42:58 +0000 (18:42 -0700)]
Merge "Fixed ApnEditor crash issue" into pi-dev
am: c670be956c

Change-Id: Id2fc2f2b535e9d992bc45a1a1206c6f0dddf29c8

6 years agoMerge "Fixed ApnEditor crash issue" into pi-dev
Pengquan Meng [Tue, 17 Apr 2018 01:26:54 +0000 (01:26 +0000)]
Merge "Fixed ApnEditor crash issue" into pi-dev

6 years agoMerge "Hide suggestion if app already been restricted" into pi-dev
Lei Yu [Tue, 17 Apr 2018 01:14:50 +0000 (18:14 -0700)]
Merge "Hide suggestion if app already been restricted" into pi-dev
am: 1d5d289d08

Change-Id: I15337dd8b0ed36134cdd05d9a09877412444a8e5

6 years agoMerge "Fix an RTL issue in Network dashboard's summary text." into pi-dev
Fan Zhang [Tue, 17 Apr 2018 00:47:09 +0000 (17:47 -0700)]
Merge "Fix an RTL issue in Network dashboard's summary text." into pi-dev
am: d743f20618

Change-Id: I36c91343b50926c844c6939fece383228470a7a7

6 years agoMerge "Hide suggestion if app already been restricted" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 00:30:08 +0000 (00:30 +0000)]
Merge "Hide suggestion if app already been restricted" into pi-dev

6 years agoMerge "Fix an RTL issue in Network dashboard's summary text." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 23:40:09 +0000 (23:40 +0000)]
Merge "Fix an RTL issue in Network dashboard's summary text." into pi-dev

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 16 Apr 2018 22:14:49 +0000 (15:14 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: f99a4a3e06  -s ours

Change-Id: Iea1d0a1bc534e1a50349782ab856013176a7ca66

6 years agoFix an RTL issue in Network dashboard's summary text.
Fan Zhang [Mon, 16 Apr 2018 21:57:51 +0000 (14:57 -0700)]
Fix an RTL issue in Network dashboard's summary text.

Bidi wrap the word "Wi-Fi" so it's RTL'd correctly in all languages

Change-Id: Ia228b8f182ba6c7b5db5c310ecb54b25937e6ab7
Fixes: 78120642
Test: visual

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 21:56:56 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoHide suggestion if app already been restricted
Lei Yu [Mon, 16 Apr 2018 18:13:11 +0000 (11:13 -0700)]
Hide suggestion if app already been restricted

Change-Id: I89904575be0236a22e4ca403bedc6adfc6cc5708
Fixes: 78014551
Test: RunSettingsRoboTests

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Apr 2018 20:18:24 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If256f5f7a79cc21e1251bd26b3b0c934d5cda71b

6 years agoMerge "Add audio switch UI in sound settings" into pi-dev
Caxton Chan [Mon, 16 Apr 2018 19:35:36 +0000 (12:35 -0700)]
Merge "Add audio switch UI in sound settings" into pi-dev
am: 03b8aa3a3c

Change-Id: I4c89750d66e4e3021e1a1a378ab4dfd16e40f883

6 years agoMerge "Add audio switch UI in sound settings" into pi-dev
Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]
Merge "Add audio switch UI in sound settings" into pi-dev

6 years agoMerge "Implement audio switch UI" into pi-dev
hughchen [Mon, 16 Apr 2018 18:56:28 +0000 (11:56 -0700)]
Merge "Implement audio switch UI" into pi-dev
am: 5a2f73151e

Change-Id: Ib20749758c6dd8a8db24e3d4dba29232bac46793

6 years agoMerge "Implement audio switch UI" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Implement audio switch UI" into pi-dev

6 years agoMerge "Remove battery usage preference in app info page" into pi-dev
Lei Yu [Mon, 16 Apr 2018 17:39:48 +0000 (10:39 -0700)]
Merge "Remove battery usage preference in app info page" into pi-dev
am: ea7dd68480

Change-Id: I91f76bbedf9ef04a8a57fd1d68c747a0beb41148

6 years agoMerge "Remove battery usage preference in app info page" 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

6 years agoMerge "Show only 1 entry for hearing aid devices without killing the activity." into...
Isha Bobra [Mon, 16 Apr 2018 16:56:17 +0000 (09:56 -0700)]
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev
am: d87acaf3cf

Change-Id: Id0d3f2912feff75a572c57230715ffeed0a68d80

6 years agoMerge "Show only 1 entry for hearing aid devices without killing the activity." into...
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

6 years agoGet rid of charging sounds toggle
Beverly [Mon, 16 Apr 2018 16:27:52 +0000 (12:27 -0400)]
Get rid of charging sounds toggle

Users can no longer toggle on/off the charging sound.

Test: manual
Bug: 77912907
Change-Id: Ie050acab3972cb1fa6716c70afb6403db4d9c887

6 years agoUse the SSID of the network in the no internet dialog
Chalard Jean [Mon, 16 Apr 2018 04:09:03 +0000 (13:09 +0900)]
Use the SSID of the network in the no internet dialog

Bug: 77865258
Test: manual & roboelectric
Change-Id: I72f1f74bf004f30a2c38b4c3af977ff09360d1e8

6 years agoAdd audio switch UI in sound settings
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

6 years agoImplement audio switch UI
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

6 years agoMerge "Register ConnectDeviceFrag with new key" into pi-dev
HJ ChangLiao [Sun, 15 Apr 2018 03:56:01 +0000 (20:56 -0700)]
Merge "Register ConnectDeviceFrag with new key" into pi-dev
am: 28041fb8cd

Change-Id: I6b1a56f48d474b8d5dc2417ce9154408bb10d328

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sun, 15 Apr 2018 03:35:44 +0000 (20:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 9470271d85  -s ours

Change-Id: I810c2412aae8c3b92a5c66d4de3494efa22a447c

6 years agoMerge "Storage wizard string changes per UX request." into pi-dev
Jeff Sharkey [Sun, 15 Apr 2018 03:28:09 +0000 (20:28 -0700)]
Merge "Storage wizard string changes per UX request." into pi-dev
am: 290edd0b73

Change-Id: Icfb93cba765d380ceb9e3c3bb855f5e4af8dc0b4

6 years agoMerge "Update fingerprint illustration" into pi-dev
Maurice Lam [Sun, 15 Apr 2018 02:55:53 +0000 (19:55 -0700)]
Merge "Update fingerprint illustration" into pi-dev
am: 20bb2edda7

Change-Id: Ibd7a1835f7dd0de4ea6c6d0569b80eb8b6470155

6 years agoMerge "Use the correct text for DND onboarding." into pi-dev
Andrew Sapperstein [Sun, 15 Apr 2018 02:50:31 +0000 (19:50 -0700)]
Merge "Use the correct text for DND onboarding." into pi-dev
am: 15234d7eb4

Change-Id: Ib47f7f86998e4e070b7d4dc4abf6be563f2d6867

6 years agoMerge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
Salvador Martinez [Sun, 15 Apr 2018 02:02:25 +0000 (19:02 -0700)]
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
am: 1678488736

Change-Id: I0ea6f839eb33ba147ebae657999164b872d57fb6

6 years agoMerge "Update bluetooth preference to take user to new screen" into pi-dev
Salvador Martinez [Sun, 15 Apr 2018 00:36:20 +0000 (17:36 -0700)]
Merge "Update bluetooth preference to take user to new screen" into pi-dev
am: ce53cbeef7

Change-Id: Ic37c4b30a82cefb4f888d5c5183b6f6bae2b67d2

6 years agoMerge "Add a wrapper Activity to launch scanning settings" into pi-dev
Lifu Tang [Sun, 15 Apr 2018 00:35:27 +0000 (17:35 -0700)]
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev
am: 6229c0f4eb

Change-Id: I43b9fa6273ded8ec9b0b0928a9d02167c720d562

6 years agoMerge "Add strings for AP band UI changes" into pi-dev
Salvador Martinez [Sun, 15 Apr 2018 00:34:56 +0000 (17:34 -0700)]
Merge "Add strings for AP band UI changes" into pi-dev
am: 6baefa4b51

Change-Id: I2fd9ae450a9cf1322338c080dedc40d7961f379d

6 years agoMerge "Remove menu from Network & Internet screen." into pi-dev
Andrew Sapperstein [Sun, 15 Apr 2018 00:34:27 +0000 (17:34 -0700)]
Merge "Remove menu from Network & Internet screen." into pi-dev
am: 23035d558a

Change-Id: Ib7a25cfad474304683304778e4fa7d32a2bb187b

6 years agoMerge "Register ConnectDeviceFrag with new key" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 23:12:48 +0000 (23:12 +0000)]
Merge "Register ConnectDeviceFrag with new key" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" 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

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Storage wizard string changes per UX request." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 03:08:23 +0000 (03:08 +0000)]
Merge "Storage wizard string changes per UX request." into pi-dev

6 years agoMerge "Update fingerprint illustration" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 01:36:27 +0000 (01:36 +0000)]
Merge "Update fingerprint illustration" into pi-dev

6 years agoMerge "Use the correct text for DND onboarding." 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

6 years agoMerge "Fix mistake in onActivityResult for ConfigureWifiSettings" 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

6 years agoFixed ApnEditor crash issue
Pengquan Meng [Wed, 11 Apr 2018 19:53:03 +0000 (12:53 -0700)]
Fixed ApnEditor crash issue

This root caused is that we closed the managed cursor which lifecycle is
managed by Activity.

Actually, we don't need the managed cursor in this case, just use the
normal cursor and close it after we got the apn data from the database.

Bug: 77894798
Test: make ROBOTEST_FILTER=ApnEditorTest -j40 RunSettingsRoboTests
Change-Id: I6eb80bbd53354e00e871e974f520668dcbceac63

6 years agoUse the correct text for DND onboarding.
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

6 years agoMerge "Update bluetooth preference to take user to new screen" into pi-dev
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

6 years agoMerge "Add a wrapper Activity to launch scanning settings" 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

6 years agoShow only 1 entry for hearing aid devices without killing the activity.
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

6 years agoMerge "Add strings for AP band UI changes" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 22:51:25 +0000 (22:51 +0000)]
Merge "Add strings for AP band UI changes" into pi-dev

6 years agoFix mistake in onActivityResult for ConfigureWifiSettings
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

6 years agoUpdate bluetooth preference to take user to new screen
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

6 years agoMerge "Remove menu from Network & Internet screen." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 22:07:22 +0000 (22:07 +0000)]
Merge "Remove menu from Network & Internet screen." into pi-dev

6 years agoRemove battery usage preference in app info page
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

6 years agoStorage wizard string changes per UX request.
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

6 years agoAdd strings for AP band UI changes
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

6 years agoRemove menu from Network & Internet screen.
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

6 years agoAdd a wrapper Activity to launch scanning settings
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

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 13 Apr 2018 20:03:28 +0000 (13:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: d57d27acab  -s ours

Change-Id: I7e6ada7ca49496e0480d020c879fe2dc0d762e51

6 years agoMerge "Hide Default apps and App permissions under Advanced." into pi-dev
Doris Ling [Fri, 13 Apr 2018 20:02:10 +0000 (13:02 -0700)]
Merge "Hide Default apps and App permissions under Advanced." into pi-dev
am: 36800c5115

Change-Id: I15bba4d3ae39d5aca176890624048bbe14a1c59f

6 years agoMerge "Warn users before they change device name." into pi-dev
Daniel Nishi [Fri, 13 Apr 2018 19:51:10 +0000 (12:51 -0700)]
Merge "Warn users before they change device name." into pi-dev
am: cd01a3ecd9

Change-Id: I75c974c944dcda55b19dc4566cdb56f9811d2212

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

6 years agoMerge "Hide Default apps and App permissions under Advanced." 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

6 years agoMerge "Warn users before they change device name." 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

6 years agoMerge "Support customizing icon color for externally items." into pi-dev
Fan Zhang [Fri, 13 Apr 2018 18:40:26 +0000 (11:40 -0700)]
Merge "Support customizing icon color for externally items." into pi-dev
am: 98a2064b61

Change-Id: I501f26d19f66e42aaa8bbcad6a7c91895a24b443

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Support customizing icon color for externally items." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:48:22 +0000 (17:48 +0000)]
Merge "Support customizing icon color for externally items." into pi-dev

6 years agoMerge "Change "Advanced battery usage" to "Battery usage"" into pi-dev
Lei Yu [Fri, 13 Apr 2018 16:55:16 +0000 (09:55 -0700)]
Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev
am: e6825db406

Change-Id: Ie9d2b695c2a86172154660430ea39a96cf66a9de

6 years agoMerge "Change "Advanced battery usage" to "Battery usage"" 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

6 years agoSupport customizing icon color for externally items.
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

6 years agoRegister ConnectDeviceFrag with new key
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

6 years agoMerge "Log app versionCode in anomaly detection" into pi-dev
Lei Yu [Fri, 13 Apr 2018 01:11:28 +0000 (18:11 -0700)]
Merge "Log app versionCode in anomaly detection" into pi-dev
am: 70bd0c6d00

Change-Id: I72c442fe4ac8b0bd3c04a63d406e15342610bce0

6 years agoMerge "Log app versionCode in anomaly detection" into pi-dev
Lei Yu [Fri, 13 Apr 2018 00:35:11 +0000 (00:35 +0000)]
Merge "Log app versionCode in anomaly detection" into pi-dev

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