Commit Graph

57262 Commits

Author SHA1 Message Date
Kevin Chyn
0967e12b69 Merge "Update attention string" into qt-r1-dev am: e218dc0517
am: ddd4fb660e

Change-Id: I015ca59b14f1ae5454a773244b772763ad87ff35
2019-08-16 19:51:51 -07:00
Kevin Chyn
60c939da52 Merge "Update attention string" into qt-r1-dev am: e218dc0517
am: 5725d33471

Change-Id: I16d624ddf3fd7014aaa9ff896eb4cacfd896df45
2019-08-16 19:51:51 -07:00
Kevin Chyn
208b633c7e Merge "Update attention string" into qt-r1-dev
am: e218dc0517

Change-Id: Ie03ff39347a98318bf44928124cdb0c4bae57f5c
2019-08-16 19:51:18 -07:00
Kevin Chyn
ddd4fb660e Merge "Update attention string" into qt-r1-dev
am: e218dc0517

Change-Id: Id6f6bb10ef8a9bcb96e03da291df3f054bda5f32
2019-08-16 19:43:00 -07:00
Kevin Chyn
5725d33471 Merge "Update attention string" into qt-r1-dev
am: e218dc0517

Change-Id: I0fd8c3a1ea66dde8eefc934cd3265cbb6fbafe0f
2019-08-16 19:42:52 -07:00
TreeHugger Robot
79d9e9069b Merge "[Wi-Fi] Check default data SIM instead of all active subscriptions for 'Switch to mobile data automatically' setting" 2019-08-17 02:40:20 +00:00
Kevin Chyn
e218dc0517 Merge "Update attention string" into qt-r1-dev 2019-08-17 02:01:31 +00:00
Arc Wang
91200e610d [Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.

This fix check the setting of active subscription and shows the preference.

Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
      manual test:
          1. Insert feature supported SIM and check UI.
          2. Remove feature supported SIM and check UI.
          3. Turn airplane mode on and check 1. and 2..

Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
2019-08-17 01:37:21 +00:00
Kevin Chyn
8e1d1ca3ab Remove attention controller
Bug: 139484065

Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Kevin Chyn
821fbc83a1 Update attention string
Bug: 139484065

Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
2019-08-16 16:34:09 -07:00
Sunny Shao
513cc9561c Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the SmartBatterySettings page.

Fixes: 139514284
Test: manual test
Change-Id: If9aee92916d02b731bdb71e9c95237e1c3ff7f1d
2019-08-16 17:14:57 +08:00
Sunny Shao
a3961cd6d7 Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the PowerUsageSummary page.

Fixes: 139515012
Test: manual test
Change-Id: I29af8ad4df303edeeb511057d53d38c847f0ff21
2019-08-16 16:49:59 +08:00
Goven Liu
fb9a140739 Merge "[Wi-Fi HotSpot] Improve Wi-Fi hotspot settings entries visibility problem" 2019-08-16 07:51:50 +00:00
Arc Wang
35b7b6d078 [Wi-Fi] Check default data SIM instead of all active subscriptions for
'Switch to mobile data automatically' setting

To align with framework design.

Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
      manual test:
          1. Insert feature supported SIM and check UI.
          2. Remove feature supported SIM and check UI.
          3. Turn airplane mode on and check 1. and 2..

Change-Id: If10616c9b47fae490521479c5abc99c5df87f409
2019-08-16 04:00:58 +00:00
hughchen
41eab2c203 Fix flaky test error
Before this CL, we didn't consider the case of two
preferences timestamp are the same.

If 2 preferences timestamp are the same, the second preference
will first out. it will cause test case will fail some times.

In this CL, if two BluetoothDevicePreference's timestamp are the same,
The first BluetoothDevicePreference is first out.

Bug: 138547532
Test: make -j42 RunSettingsRoboTests
Change-Id: I7366275e8edf615c582481a570ea0c25b8d37a66
2019-08-16 01:26:42 +00:00
TreeHugger Robot
33051103c6 Merge "Use FooterPreference in xml explicitly" 2019-08-15 15:47:24 +00:00
TreeHugger Robot
64600161fa Merge "Remove useless png and add vector drawable" 2019-08-15 15:41:04 +00:00
TreeHugger Robot
1123b160dd Merge "Use dynamic footer" 2019-08-15 14:01:39 +00:00
TreeHugger Robot
4be1531107 Merge "Use FooterPreference in xml explicitly" 2019-08-15 13:03:40 +00:00
govenliu
6ee894759a [Wi-Fi HotSpot] Improve Wi-Fi hotspot settings entries visibility problem
When the security type of hotspot changed, the hidden item will showed because of the Expanded child list is set as constant.

To improve it, dynamicall adjust the Expanded child count according to the security type.

Bug: 138594907
Test: Manually
      1. Enter Settings APP -> Network & internet -> Hotspot & tethering
      ->Wi-Fi hotspot
      2. Check if there are only two expanded items if the
      Security type is None, or three expaned items if the Security type
      is WPA2-personal
      3. Change the Security type and back to check item 2 match or not.

Change-Id: I84d1c5dca94d6a218cfc7ecd57e201e1cffdd878
2019-08-15 19:07:22 +08:00
TreeHugger Robot
182ca7893f Merge "Use FooterPreference in xml explicitly" 2019-08-15 10:42:27 +00:00
Raff Tsai
cf1489891a Remove useless png and add vector drawable
Bug: 139336138
Test: visual
Change-Id: I5ccf4855b63f47b138a1662317d0c4ba8ce8984c
2019-08-15 18:04:49 +08:00
Sunny Shao
bd7a034ae3 Use dynamic footer
Removed the FooterPreferenceMixin from the UsbDefaultFragment page.

Fixes: 139460691
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.connecteddevice.usb
Change-Id: Iadf1d4893019827077875d02e3ebe380662aeb2c
2019-08-15 17:42:25 +08:00
Sunny Shao
49ffd8f39f Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the BluetoothDashboardFragment page.

Fixes: 139459430
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.connecteddevice
Change-Id: I8a8b6ba656405f938e203e20e5973c1560c3a35a
2019-08-15 08:48:47 +00:00
Xin Li
12e938cfb2 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours am: b03fdd4dcf -s ours am: e66eb255ee am: 0907055fcc
am: 78d26fb0c9 -s ours
am skip reason: subject contains skip directive

Change-Id: I2373dd481006230b4ca361356959690093b6ec27
2019-08-15 01:22:00 -07:00
Xin Li
78d26fb0c9 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours am: b03fdd4dcf -s ours am: e66eb255ee
am: 0907055fcc

Change-Id: Icc83271d489e604763a2de9ac1a18fe40df12ea6
2019-08-15 01:12:05 -07:00
Sunny Shao
6e21c76111 Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the ManageAssist page.

Fixes: 139457944
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications
Change-Id: I89b6cac21e924774a1fcfe790863d8eaab8d6da7
2019-08-15 15:56:10 +08:00
Xin Li
6ef36e9c34 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours am: f8c25b6ac4 -s ours am: f62f61cbfb am: ea995aaaff
am: a3a692bd24 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4feb8e6c7a3cce8b1ff41f5d34ca42a0d1e5afe
2019-08-15 00:54:21 -07:00
Xin Li
0907055fcc [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours am: b03fdd4dcf -s ours
am: e66eb255ee

Change-Id: I34d560cf4bdd6b47e0a45c070185ba3f4eaa1f52
2019-08-15 00:50:19 -07:00
Xin Li
e66eb255ee [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours
am: b03fdd4dcf -s ours
am skip reason: subject contains skip directive

Change-Id: I8b48996bdb25fda1adb55fcb63a3956dddbb8710
2019-08-15 00:40:41 -07:00
Xin Li
a3a692bd24 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours am: f8c25b6ac4 -s ours am: f62f61cbfb
am: ea995aaaff

Change-Id: I6e4fa97cb38312c8ab059e1693ddcc549c8fb68f
2019-08-15 00:36:07 -07:00
Xin Li
b03fdd4dcf [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am: 1e53efc4c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I1898ca933b111068bd8b7eafbe5421096c313d9e
2019-08-15 00:25:54 -07:00
Xin Li
ea995aaaff [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours am: f8c25b6ac4 -s ours
am: f62f61cbfb

Change-Id: I6b798a4044f146cad1f6824e17aa82f80521251f
2019-08-15 00:16:41 -07:00
Sunny Shao
30cfc2553e Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the some accessibility pages.

Fixes: 139455988
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: Ia1568e0a120eede26fadc16764caef2ecfb2411a
2019-08-15 15:11:16 +08:00
Xin Li
f62f61cbfb [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours
am: f8c25b6ac4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieeffd5db1009f7dda5b595f3a6790ec1f2ce6db8
2019-08-14 23:52:30 -07:00
Xin Li
f8c25b6ac4 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am: c3ef16882d -s ours
am skip reason: subject contains skip directive

Change-Id: I1d1b46e30a9ec5b4e01f351342fe45ac64994d47
2019-08-14 23:32:21 -07:00
Treehugger Robot
1e53efc4c4 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" 2019-08-15 06:13:48 +00:00
Raff Tsai
4eafc5aaf6 Merge "Replace png to vector drawable" 2019-08-15 01:02:04 +00:00
Xin Li
4ae70b518f [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 9821df1b1f -s ours am: 8cabf84832 am: 2f464241a1
am: 3cbc718e81 -s ours
am skip reason: subject contains skip directive

Change-Id: Id7b63cbe38994253c5b1951f90fcd07eff21de7d
2019-08-14 15:36:15 -07:00
Xin Li
3cbc718e81 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 9821df1b1f -s ours am: 8cabf84832
am: 2f464241a1

Change-Id: If10e25b1cdc28a6357a06254701beabd6624671a
2019-08-14 14:23:33 -07:00
Xin Li
2f464241a1 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 9821df1b1f -s ours
am: 8cabf84832

Change-Id: I8501d7bdfb3c8bb5e6ddf5e19aeb8335f81d18bf
2019-08-14 13:56:58 -07:00
Xin Li
8cabf84832 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 9821df1b1f -s ours
am skip reason: subject contains skip directive

Change-Id: If1da8066529d53cf10298533987f7d7f7c57d405
2019-08-14 13:32:06 -07:00
Roshan Pius
5c3a161cc3 Merge "Settings(wifi): Allow mainline wifi stack to use network request dialog" 2019-08-14 19:33:12 +00:00
TreeHugger Robot
c61b43d043 Merge "Use FooterPreference in xml explicitly" 2019-08-14 19:03:35 +00:00
Xin Li
9821df1b1f DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
Bug: 134405016
Change-Id: I80e9ac9e5e6a21ebd94543865b8f75c20020360d
2019-08-14 11:35:21 -07:00
TreeHugger Robot
8b1e3029b1 Merge "Use FooterPreference in xml explicitly" 2019-08-14 14:42:49 +00:00
TreeHugger Robot
78d2c2fc56 Merge "Use FooterPreference in xml explicitly" 2019-08-14 09:39:29 +00:00
TreeHugger Robot
73cb0b104a Merge "Remove PreferenceCategory wrapper" 2019-08-14 09:18:28 +00:00
Sunny Shao
8eef6edfc1 Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the ToggleFeaturePreferenceFragment page.

Fixes: 139400387
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I8a61ddf2be500e3dc3b1a9503a7a671a5538c537
2019-08-14 16:53:47 +08:00
Raff Tsai
4831332a1c Replace png to vector drawable
Bug: 139336138
Test: visual
Change-Id: Ic778b7ce6ecfc48cb35a5618fd766d69d67a0834
2019-08-14 16:01:33 +08:00