OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "WallpaperTypeSettings use DashboardFragment"
TreeHugger Robot [Tue, 17 Apr 2018 20:55:26 +0000 (20:55 +0000)]
Merge "WallpaperTypeSettings use DashboardFragment"

6 years agoMerge "Migrate UserDictionaryList to DashboardFragment"
TreeHugger Robot [Tue, 17 Apr 2018 20:53:35 +0000 (20:53 +0000)]
Merge "Migrate UserDictionaryList to DashboardFragment"

6 years agoWallpaperTypeSettings use DashboardFragment
Mill Chen [Thu, 12 Apr 2018 13:53:22 +0000 (13:53 +0000)]
WallpaperTypeSettings use DashboardFragment

- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.

Bug: 73899467
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wallpaper
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Test: atest SettingsGatewayTest UniquePreferenceTest
Change-Id: I519a76ff34bcd4195b0ad6ad406a8f66371923d2

6 years agoMigrate UserDictionaryList to DashboardFragment
Emily Chuang [Tue, 3 Apr 2018 13:00:49 +0000 (21:00 +0800)]
Migrate UserDictionaryList to DashboardFragment

- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.

Test: manual
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest
Change-Id: Ia3d885cb8917c7d5498b87818e24b938f0d95dbb

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

Change-Id: I9924d4a2fe8ce0e9b1eadf27c72f5039abf7265f

6 years agoMerge "Remove empty_search_image from Settings." into pi-dev am: aac0198923
Fan Zhang [Tue, 17 Apr 2018 19:13:28 +0000 (12:13 -0700)]
Merge "Remove empty_search_image from Settings." into pi-dev am: aac0198923
am: fd7afc7429

Change-Id: I9169d296db4ef6a7361434953697882401f16737

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 am: 68f331d452
Julia Reynolds [Tue, 17 Apr 2018 18:22:04 +0000 (11:22 -0700)]
Merge "Show suppression msg under ringer slider" into pi-dev am: 68f331d452
am: 1351e761c8

Change-Id: I71b7a1ce25f3754ef2041419f2ddde33d48fa7e7

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 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 agoMerge "Settings: Add synonyms to display cutout emulation setting" into pi-dev am...
Adrian Roos [Tue, 17 Apr 2018 17:20:20 +0000 (10:20 -0700)]
Merge "Settings: Add synonyms to display cutout emulation setting" into pi-dev am: fb04d4acf7
am: 6038bc728a

Change-Id: I12e2ebfe43228d89cf23d275909dd12ab0e402bc

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 agoMove device detail edit button from menu to header
HJ ChangLiao [Thu, 12 Apr 2018 05:14:57 +0000 (13:14 +0800)]
Move device detail edit button from menu to header

Move the edit button on Bluetooth device detail,
From action bar menu to header.
Use EntityHeaderController to add and control,
Rename those method because we use them on
more than one place now.

Change-Id: I3afad6baeab80895c109603e2ab13428582a4dd8
Fixes: 76206922
Test: make RunSettingsRoboTests

6 years agoRemove swipe up setting page if the feature is not available am: e848603807
Mehdi Alizadeh [Tue, 17 Apr 2018 03:04:36 +0000 (20:04 -0700)]
Remove swipe up setting page if the feature is not available am: e848603807
am: 788bf1dd39

Change-Id: I75e9ac7d96ce99f42abe2c91aed659dca0607112

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

Change-Id: I1727deb8f6298709f5629b734acf6b7a1f174bc2

6 years agoMerge "Fixed ApnEditor crash issue" into pi-dev am: c670be956c
Pengquan Meng [Tue, 17 Apr 2018 02:43:38 +0000 (19:43 -0700)]
Merge "Fixed ApnEditor crash issue" into pi-dev am: c670be956c
am: 755426d7d8

Change-Id: I575e6775a47a2cd8b8bff3e2ab55309744a72e0a

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 "Hide suggestion if app already been restricted" into pi-dev am: 1d5d289d08
Lei Yu [Tue, 17 Apr 2018 02:01:41 +0000 (19:01 -0700)]
Merge "Hide suggestion if app already been restricted" into pi-dev am: 1d5d289d08
am: 3f3c3c1c70

Change-Id: Ibc8a5d5ee7e52ffdeb364061afcf3af6e0b2366a

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 "Fix an RTL issue in Network dashboard's summary text." into pi-dev am: d743f20618
Fan Zhang [Tue, 17 Apr 2018 01:47:22 +0000 (18:47 -0700)]
Merge "Fix an RTL issue in Network dashboard's summary text." into pi-dev am: d743f20618
am: fc47444c61

Change-Id: I0de8b7e6780768fe32fe5fe0eb3ae42c2f78f8d4

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 agoMerge "Migrate ManagedProfileSettings to DashboardFragment"
TreeHugger Robot [Mon, 16 Apr 2018 22:56:55 +0000 (22:56 +0000)]
Merge "Migrate ManagedProfileSettings to DashboardFragment"

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

Change-Id: I3e1ec307ea4d5d87209b0093f0d4e84e47f9eb44

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 am: 03b8aa3a3c
Caxton Chan [Mon, 16 Apr 2018 19:50:38 +0000 (12:50 -0700)]
Merge "Add audio switch UI in sound settings" into pi-dev am: 03b8aa3a3c
am: 160c30151f

Change-Id: I23b4cc7431a38fc3314547393d190d3020d6f75f

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 agoMigrate ManagedProfileSettings to DashboardFragment
jason_chiu [Tue, 3 Apr 2018 03:37:09 +0000 (11:37 +0800)]
Migrate ManagedProfileSettings to DashboardFragment

- Move preference related logic to Controllers.
- Add some test cases for controllers.

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      atest SettingsGatewayTest UniquePreferenceTest
Change-Id: If4fcd7bf572672c886d5c91b2d15013817d1aa67

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 "Remove the dependency on InputMethodSettings"
TreeHugger Robot [Mon, 16 Apr 2018 19:19:48 +0000 (19:19 +0000)]
Merge "Remove the dependency on InputMethodSettings"

6 years agoMerge "Implement audio switch UI" into pi-dev am: 5a2f73151e
hughchen [Mon, 16 Apr 2018 19:12:21 +0000 (12:12 -0700)]
Merge "Implement audio switch UI" into pi-dev am: 5a2f73151e
am: 608d436da0

Change-Id: Iea47d84345cfd10388a4c2ad34d5cedcfe7eaeb6

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 am: ea7dd68480
Lei Yu [Mon, 16 Apr 2018 17:59:36 +0000 (10:59 -0700)]
Merge "Remove battery usage preference in app info page" into pi-dev am: ea7dd68480
am: e5b270a4dd

Change-Id: I394652b3b170625fc51f54d675c9a07d951a72a3

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 17:03:34 +0000 (10:03 -0700)]
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev am: d87acaf3cf
am: 595cda2d14

Change-Id: I49973a65a31f5f79722c4e4841f2dcda34128edb

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 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 am: 28041fb8cd
HJ ChangLiao [Sun, 15 Apr 2018 04:11:37 +0000 (21:11 -0700)]
Merge "Register ConnectDeviceFrag with new key" into pi-dev am: 28041fb8cd
am: 5c79fbd97c

Change-Id: I950ccf423738ba6fce2d9a526d505384b04c50e7

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 am: 947027...
Bill Yi [Sun, 15 Apr 2018 03:53:37 +0000 (20:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9470271d85  -s ours
am: cbb9ab8ad3  -s ours

Change-Id: I41fb8019799db51d33c1aca7267f719801550647

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

Change-Id: Ie66f1e4d6daa98640e7e56efb7862be0d1c18914

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 am: 20bb2edda7
Maurice Lam [Sun, 15 Apr 2018 03:16:09 +0000 (20:16 -0700)]
Merge "Update fingerprint illustration" into pi-dev am: 20bb2edda7
am: 13c77a93a9

Change-Id: I62e2e925beb940cb6d37b0d94eda3c6bbca2bede

6 years agoMerge "Use the correct text for DND onboarding." into pi-dev am: 15234d7eb4
Andrew Sapperstein [Sun, 15 Apr 2018 03:10:27 +0000 (20:10 -0700)]
Merge "Use the correct text for DND onboarding." into pi-dev am: 15234d7eb4
am: 3b6cbb2f4c

Change-Id: Ia7f900929a6d36457581ae3fae7601eff9adaad7

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 am...
Salvador Martinez [Sun, 15 Apr 2018 02:28:54 +0000 (19:28 -0700)]
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev am: 1678488736
am: 230d6420b9

Change-Id: I5a05e1bf619b4999d3f329dcc6ce267dba95e598

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 ago[automerger skipped] Merge "Update bluetooth preference to take user to new screen...
Salvador Martinez [Sun, 15 Apr 2018 01:20:29 +0000 (18:20 -0700)]
[automerger skipped] Merge "Update bluetooth preference to take user to new screen" into pi-dev am: ce53cbeef7
am: fbc5abb8e1  -s ours

Change-Id: Ia4d639f332780d767e17edc512b57027421ea275

6 years agoMerge "Add a wrapper Activity to launch scanning settings" into pi-dev am: 6229c0f4eb
Lifu Tang [Sun, 15 Apr 2018 01:19:52 +0000 (18:19 -0700)]
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev am: 6229c0f4eb
am: 531defb0b3

Change-Id: I2fe689240c8fc6bb4b24fc3428e0311d47dc1ad8

6 years agoMerge "Add strings for AP band UI changes" into pi-dev am: 6baefa4b51
Salvador Martinez [Sun, 15 Apr 2018 01:19:25 +0000 (18:19 -0700)]
Merge "Add strings for AP band UI changes" into pi-dev am: 6baefa4b51
am: 0354854ab9

Change-Id: I5fe06ecc6c96d2cdff78fea1e93fe5dc28c3e587

6 years agoMerge "Remove menu from Network & Internet screen." into pi-dev am: 23035d558a
Andrew Sapperstein [Sun, 15 Apr 2018 01:18:53 +0000 (18:18 -0700)]
Merge "Remove menu from Network & Internet screen." into pi-dev am: 23035d558a
am: 3fdfb99375

Change-Id: I88a8e8d7ee77bafb5b8180d6d882d1ed9c09bd1f

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 agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 14 Apr 2018 04:33:12 +0000 (04:33 +0000)]
Merge "Import translations. DO NOT MERGE"

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 agoImport translations. DO NOT MERGE
Bill Yi [Sat, 14 Apr 2018 02:53:43 +0000 (19:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7cf53a9ffbc077211999a42f73bb41e5cbe78932
Auto-generated-cl: translation import

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 agoRemove the dependency on InputMethodSettings
Yohei Yukawa [Sat, 14 Apr 2018 01:13:09 +0000 (18:13 -0700)]
Remove the dependency on InputMethodSettings

InputMethodUtils.InputMethodSetting is a quite complicated inernal
class of InputMethodUtils and PhysicalKeyboardFragment's depending on
it just for getting/setting SHOW_IME_WITH_HARD_KEYBOARD is overkill.

With this CL, PhysicalKeyboardFragment just uses Secure Settings APIs
directly.

There should be no user-visible behavior change.

Bug: 77730201
Test: Manually verified as follows:
 1. Open system settings.
 2. Tap "System" -> "Languages & input" -> "Physical keyboard"
 3. Make sure "Show virtual keyboard" is unchecked
 4. Make sure the following command shows 0
      adb shell settings get secure show_ime_with_hard_keyboard
 5. Check "Show virtual keyboard"
 6. Make sure the following command shows 1
      adb shell settings get secure show_ime_with_hard_keyboard
 7. Run the following command
      adb shell settings put secure show_ime_with_hard_keyboard 0
 8. Make sure "Show virtual keyboard" is chenged to unchecked
Change-Id: I956da5dad27313d6edf141f2320bb0a7954fbbea

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 agoUse DateUtils to build account sync timestamp
Fan Zhang [Fri, 13 Apr 2018 22:25:32 +0000 (15:25 -0700)]
Use DateUtils to build account sync timestamp

Change-Id: I2158855bd2caba42f64d24ab2fb00c6b561e5cef
Fixes: 77913394
Test: visual

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