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
Sunny Shao
a6c0bd5346
Use FooterPreference in xml explicitly
...
Removed the FooterPreferenceMixin from the TetherSettings page.
Fixes: 139397226
Test: manual test
Change-Id: Ice7f97881df9cc17177ed7fcc1da9f3124c445a9
2019-08-14 14:46:23 +08:00
Sunny Shao
a47e7ddcc3
Use FooterPreference in xml explicitly
...
Removed the FooterPreferenceMixin from the DataSaverSummary page.
Fixes: 139393749
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datausage
Change-Id: Ie229acd903eb24e369beef8bbf5ff0bdd9ce50d1
2019-08-14 13:52:08 +08:00
TreeHugger Robot
5c4f9b3748
Merge "Use FooterPreference in xml explicitly"
2019-08-14 05:12:33 +00:00
Raff Tsai
896de3b48b
Remove PreferenceCategory wrapper
...
- Avoid similiar issue in b/130396913
Bug: 124129485
Test: manual
Change-Id: I6f4698304210bacba5c76020c375dda49330d2cc
2019-08-14 12:31:06 +08:00
Jason Chiu
e856e2b738
Change deprecated slice APIs to new ones
...
Bug: 138979954
Test: robotest
Change-Id: Ibc430f9975d4e40be00ae4ba61833e94cd090a0c
2019-08-14 11:34:27 +08:00
Jordan Liu
772e21598e
[automerger skipped] Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
am: b377a593b7
am: 1fc63fc444
am: 028f2c87a1
...
am: eda0936e38
-s ours
am skip reason: change_id Idbde691c60b53e0ab755df229a3a9dc77406934d with SHA1 8b0ff8dce1
is in history
Change-Id: I69eb3060317f3747e48d17be0ecff7c52d796d7b
2019-08-13 19:27:39 -07:00
Jordan Liu
eda0936e38
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
am: b377a593b7
am: 1fc63fc444
...
am: 028f2c87a1
Change-Id: I6f6c67b41652ce9b2638aca922ad489db74a0495
2019-08-13 19:13:45 -07:00
Jordan Liu
028f2c87a1
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
am: b377a593b7
...
am: 1fc63fc444
Change-Id: I114db364c10315dca50b75270fc14da7eaf1d354
2019-08-13 19:01:30 -07:00
Jordan Liu
1fc63fc444
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
...
am: b377a593b7
Change-Id: Ibe68e60583fdf2bd08d6d8f62b5c942878dd160e
2019-08-13 18:48:49 -07:00
Arc Wang
05381bf009
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem"
2019-08-14 01:44:18 +00:00
Jordan Liu
b377a593b7
Merge "Allow radio info on phones with no subscription"
...
am: 19d1f890a0
Change-Id: Ia63778cf83212b2670413e2567c068bf92f6ff05
2019-08-13 18:37:15 -07:00
Jordan Liu
19d1f890a0
Merge "Allow radio info on phones with no subscription"
2019-08-14 00:22:42 +00:00
Xin Li
c3ef16882d
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
2019-08-13 16:36:39 -07:00
Jordan Liu
032ca466f1
Merge "Allow radio info on phones with no subscription"
2019-08-13 19:45:05 +00:00
android-build-team Robot
573db8a758
Snap for 5674421 from 4a949c0640
to pi-platform-release
...
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
2019-08-13 16:25:08 +00:00
Arc Wang
fe9a794eaf
[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 all active subscriptions and shows the preference
when there is one SIM applies.
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
2019-08-13 13:03:19 +00:00
TreeHugger Robot
0ec21f8a1b
Merge "Fix some icons are missing in dark mode"
2019-08-13 12:37:42 +00:00
Sunny Shao
1bebe19101
Use FooterPreference in xml explicitly
...
Removed the FooterPreferenceMixin from the ChooseLockGeneric page.
Fixes: 139269907
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Change-Id: I86e294015354c0a6a6311441892a770503382d1f
2019-08-13 20:08:54 +08:00
TreeHugger Robot
66ca4bbd75
Merge "Fix flaky test error"
2019-08-13 11:19:30 +00:00
TreeHugger Robot
4f9595a88d
Merge "Make Bluetooth settings page can be discoverable"
2019-08-13 09:57:39 +00:00
Raff Tsai
65ad3da004
Fix some icons are missing in dark mode
...
- Those icons are black, they are invisible in black background.
Removed the png files and used vector drawable instead.
- Remove a duplicated string
Fixes: 139101780
Test: visual
Change-Id: Id77aba716a304d38af6346bcdf436a4a9aebfd8c
2019-08-13 16:05:51 +08:00
hughchen
2353dd54b8
Fix flaky test error
...
Use mac address to check preference whether is equal instead of use
preference.
Bug: 138547532
Test: make -j42 RunSettingsRoboTests
Change-Id: Iffbbdf063e78a3bf40e74d798ef4dd3a439f8677
2019-08-13 11:26:02 +08:00
hughchen
a0b167e3da
Make Bluetooth settings page can be discoverable
...
Bug: 118760361
Test: make -j42 RunSettingsRoboTests
Change-Id: I2f663197f3c0f6c58529609845bab4dd7e714348
2019-08-13 10:41:34 +08:00
Yi Jiang
8d16175c21
[automerger skipped] Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev am: 7933af0273
...
am: 943e7b34e8
-s ours
am skip reason: change_id I5568b569ecd4db943f1a239c7ddcd2923bec4028 with SHA1 06f0bd6d4e
is in history
Change-Id: I77f8c9a8c27f506bfd4e9c54a1ad844b77f4c724
2019-08-12 18:51:43 -07:00
Yi Jiang
e6af4e136b
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
...
am: 7933af0273
Change-Id: Iecc58066521d19bb58514eca667a5f4daecbe0de
2019-08-12 18:51:42 -07:00
TreeHugger Robot
e796653f0a
Merge "Clean up "Restrict SMS" developer setting"
2019-08-13 01:45:40 +00:00
Yi Jiang
943e7b34e8
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
...
am: 7933af0273
Change-Id: Ibb750cc10763ade05e3f611a22e602ea3ebe7d5e
2019-08-12 18:41:16 -07:00