Commit Graph

56173 Commits

Author SHA1 Message Date
Bill Yi
49c7a74c59 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
am: 5188a0560f -s ours
am skip reason: subject contains skip directive

Change-Id: I76c3bc3fd54c2cb51d44feef20f542a76dc9b00b
2019-08-17 09:55:19 -07:00
Bill Yi
c94de34259 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
am: 978cd2b768 -s ours
am skip reason: subject contains skip directive

Change-Id: I0acc5b0bd1a1f29bb5acbfd6d17d3da7f4f84dcf
2019-08-17 09:55:17 -07:00
Bill Yi
978cd2b768 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 7892f729a5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia2280686d74a66951529c333f5c7e6a05d989208
2019-08-17 09:45:16 -07:00
Bill Yi
5188a0560f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 7892f729a5 -s ours
am skip reason: subject contains skip directive

Change-Id: I02568545b0452c41a81daf515960665dbf7516cc
2019-08-17 09:45:15 -07:00
Bill Yi
735e8a680d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 7892f729a5 -s ours
am skip reason: subject contains skip directive

Change-Id: Id230b9e65dd2bb45e599c6064be37203eb4ac014
2019-08-17 09:45:15 -07:00
TreeHugger Robot
7892f729a5 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-08-17 16:30:21 +00:00
Arc Wang
69d3c16b0e [automerger skipped] Merge "Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 2394d0821b" into qt-qpr1-dev-plus-aosp
am: 22cbd5ca0d -s ours
am skip reason: change_id I72b6db415429181395a02f163889bb1b9c0f070f with SHA1 91200e610d is in history

Change-Id: Ic0e8518e114df09523d8975c5d9cda4706919598
2019-08-17 07:43:42 -07:00
Arc Wang
3c01d14d7e [automerger skipped] Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 0e53b6293d
am: a266ec8ffd -s ours
am skip reason: change_id I72b6db415429181395a02f163889bb1b9c0f070f with SHA1 fe9a794eaf is in history

Change-Id: I8589c116bb499cc9740bcb832a954ea776e1b070
2019-08-17 07:37:29 -07:00
Android Build Merger (Role)
22cbd5ca0d Merge "Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 2394d0821b" into qt-qpr1-dev-plus-aosp 2019-08-17 14:28:18 +00:00
Arc Wang
a266ec8ffd Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
am: 0e53b6293d

Change-Id: I574c161e5cdde8f879031ff403082dddefe0dbb9
2019-08-17 07:27:01 -07:00
Arc Wang
aece3458cf Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
am: 2394d0821b

Change-Id: I4e7873288289b705885cd2ea57879136d114694f
2019-08-17 07:26:55 -07:00
Arc Wang
0e53b6293d Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am: 54dbed859d

Change-Id: I0d5071d429dbd82d420e1199bd5baed0b687e2ae
2019-08-17 07:18:03 -07:00
Arc Wang
2394d0821b Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am: 54dbed859d

Change-Id: I19214265a783f092bb183b3341aa1c2116f3188f
2019-08-17 07:17:59 -07:00
Arc Wang
5101624819 Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am: 54dbed859d

Change-Id: I7267b4fe82f6e5e6e6523463eb710049c68e66f9
2019-08-17 07:17:59 -07:00
TreeHugger Robot
54dbed859d Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev 2019-08-17 13:58:53 +00:00
Bill Yi
0bb9d1e153 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
2019-08-17 01:35:46 -07:00
Kevin Chyn
058af41a42 Remove delay from enroll start button
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:52:30 +00:00
Kevin Chyn
1ae8beab06 Remove delay from enroll start button
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:51:23 +00:00
TreeHugger Robot
98ae0159cd Merge "Use FooterPreference in xml explicitly" 2019-08-17 04:45:14 +00:00
Kevin Chyn
86b34f8b65 Merge "Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: 5725d33471" into qt-qpr1-dev-plus-aosp
am: 0abf9968d7

Change-Id: I6fec879f322d348cd562e2ef69678556fde6a4ce
2019-08-16 20:30:14 -07:00
Kevin Chyn
4969e3c409 Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: ddd4fb660e
am: 0967e12b69

Change-Id: I6286f94b2aceb5e2da1239ff002322ae4474ff4b
2019-08-16 20:28:28 -07:00
Kevin Chyn
f490c7cb7f Merge "Update attention string" into qt-r1-dev am: e218dc0517
am: 5725d33471

Change-Id: Ic8302db945bdf128bb04eda2ba6105abe6083ce0
2019-08-16 20:01:16 -07:00
Android Build Merger (Role)
0abf9968d7 Merge "Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: 5725d33471" into qt-qpr1-dev-plus-aosp 2019-08-17 02:52:20 +00:00
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