TreeHugger Robot
256de04464
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I8462c36866641491631cfcc8aed8bdde8b5ea984
2021-05-11 06:40:53 +00:00
Hugh Chen
6fee770ea0
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I7fdb4bbb527008c0f64cab9d8c101f4301f92c62
2021-05-11 06:40:52 +00:00
TreeHugger Robot
e790b378c3
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Ic3753ba1c4945113050f87feb611f23d1cd5b79e
2021-05-11 06:40:46 +00:00
Hugh Chen
933f807885
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours
...
am skip reason: skipped by user hughchen
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I27a2ef608420e73b9ae797cbcdc73d82228312c5
2021-05-11 06:40:46 +00:00
TreeHugger Robot
045aa65893
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I3a7d52f4c65391196464641f9cf20436b58762c1
2021-05-11 06:32:20 +00:00
Hugh Chen
8dbc94fcbe
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I31dde5548cb9ae735e8f342548b8e6fb799b0104
2021-05-11 06:32:19 +00:00
TreeHugger Robot
e5e19dd41a
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I8cc36a74ea8abdaa25bc0876e4e4ce9218808d3b
2021-05-11 06:32:12 +00:00
Hugh Chen
392fb7a4f7
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I2afcbd48ae913e348764246122dc0f0fef03ec46
2021-05-11 06:32:11 +00:00
TreeHugger Robot
16e8c4783e
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I474d15a6db416860a5a34253a7a0ed000912bafc
2021-05-11 06:32:04 +00:00
Hugh Chen
effac8a0c1
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: Ib65fe3dd30eb3dd84a2f4949de6eaa32f2b24146
2021-05-11 06:32:02 +00:00
TreeHugger Robot
94e5b18951
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I0deadd94935bad2a6cae221c11054eb33557f22e
2021-05-11 06:24:14 +00:00
Hugh Chen
fe87f1ac34
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I668163c48cd6de7ac9236a878550d7a80eb9c7ac
2021-05-11 06:24:14 +00:00
TreeHugger Robot
24ef90eaaa
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: If31a9fca9d45ae3d0408874a34427f8ca8984f49
2021-05-11 06:24:06 +00:00
Hugh Chen
3607e825b9
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I223f7a495fa5640217ee7de19a24fa6490918336
2021-05-11 06:24:06 +00:00
TreeHugger Robot
fc721d09cb
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ie84e9ff000ff0860ec83d704ffe61c2d74164f96
2021-05-11 06:18:45 +00:00
Hugh Chen
9bbcb55a23
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ie3e897ff1e8259b5d24dc1291e0683f325c2d7fe
2021-05-11 06:18:44 +00:00
TreeHugger Robot
38a2b32e94
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I0431e3135de7bb952fa8e8185b6eef44a1c24dc7
2021-05-11 06:18:37 +00:00
Hugh Chen
8a4f60b143
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I44435d83016a9c974d704cab9de7fa50df1515f3
2021-05-11 06:18:35 +00:00
TreeHugger Robot
cb2b575a9d
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Iaf718af21458079e30afc205e0888bb7e1da58ca
2021-05-11 06:18:12 +00:00
Hugh Chen
e914289a2c
RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I5c756e1ae08c73f8a20ceacb106eb51b9cc3267b
2021-05-11 06:18:11 +00:00
TreeHugger Robot
9724c735da
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ia0822c53ab65ce90334aee521be99886945d41e8
2021-05-11 06:16:53 +00:00
Hugh Chen
53ff99b8b4
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I23ab4bb935d65f3afda82333291d0ea7a187428a
2021-05-11 06:16:53 +00:00
TreeHugger Robot
54f47d0953
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I4a4c7bd80496a8fa883c895080d4d4c48a3fa3e9
2021-05-11 06:16:43 +00:00
Hugh Chen
7b05629834
RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I7256d5f30d6c4b3063181a768b5d3796cf517383
2021-05-11 06:16:42 +00:00
TreeHugger Robot
f9c99c40d2
Merge changes Ia51528f2,Id27a7809 into pi-dev
...
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-11 06:03:54 +00:00
TreeHugger Robot
75e33fb315
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev
...
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-11 06:03:45 +00:00
TreeHugger Robot
f45fa1bf85
Merge changes Ia51528f2,Id27a7809 into rvc-dev
...
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-11 06:03:28 +00:00
TreeHugger Robot
4074cd5e48
Merge changes Ia51528f2,Id27a7809 into qt-dev
...
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-11 06:03:19 +00:00
Wesley.CW Wang
7a8d2f4486
Fix color check error
...
Bug: 187772407
Test: make SettingsRoboTests; repo upload
Change-Id: Ia1c89864043d201e8c7a180c9087a56e6f4ca235
2021-05-11 13:21:38 +08:00
YUKAI HUNG
7a678f29b2
Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev
2021-05-11 03:47:58 +00:00
Peter Kalauskas
c24234c301
Add tests for guest user events
...
Also, move ACTION_USER_GUEST_EXIT_CONFIRMED so it is only logged after
safety-check
Test: ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest" m RunSettingsRoboTests
Test: ROBOTEST_FILTER="com.android.settings.users.UserDetailsSettingsTest" m RunSettingsRoboTests
Bug: 184200796
Change-Id: Id18aa914bbb262984d7c7cf4b8a4ffdde278fd23
2021-05-10 20:36:48 -07:00
Sunny Shao
a82183a5f9
Disable the info icon
...
- Show disabled info icon.
- Remove the duplicated resouce files.
Fix: 186608804
Fix: 182870810
Test: manual test
Change-Id: I8c0ddc8f76921965073699d5bd029dc1b9d59fb0
2021-05-11 11:12:03 +08:00
Jason Chiu
0c2fa9cd69
Merge "Apply the new search bar background color" into sc-dev
2021-05-11 02:42:08 +00:00
Joe Bolinger
971f0f3c5a
Add userId parameter to all uses of challenge in settings.
...
Bug: 184915229
Test: manually on device (as normal, extra user, & work profile)
Change-Id: Id509b5866d53525b38a5bb95bbbcc723d6651745
2021-05-10 18:26:57 -07:00
Quang Luong
8f421b2dbf
Refresh security pref in Network Details page
...
Security type of WifiEntry may change based on available
scans/configs/the current connection for entries that can support
multiple security types. Refresh the security string every time the
WifiEntry is updated.
Bug: 185914718
Test: manual inspection that connected wifi entry has the correct
security string
Change-Id: I5f3b7274f1e6b68de414493a6619555ee9b17e23
2021-05-10 17:48:53 -07:00
Abel Tesfaye
88a773892b
Add warning message when power save mode is enabled for smart auto rotate settings fragment
...
Test: locally with flame, make RunSettingsRoboTests -j96
ROBOTEST_FILTER=SmartAutoRotateBatterySaverControllerTest,SmartAutoRotateControllerTest
Bug: 186690152
Change-Id: Ibac90a4edd4631e8256da79d0594ac7704b5f8f7
2021-05-10 19:30:04 +00:00
Abel Tesfaye
51ce242573
Add warning message when power save mode is enabled for attention settings fragment
...
Test: locally with flame, make RunSettingsRoboTests -j96 ROBOTEST_FILTER=AdaptiveSleepPreferenceControllerTest,AdaptiveSleepBatterySaverPreferenceControllerTest
Bug: 186690152
Change-Id: I42e018a8cf48166a8250fac9510a8882efb58568
2021-05-10 19:27:17 +00:00
Jakub Pawlowski
68f799a4c6
Prevent drawing on top of DevicePickerActivity
...
Bug: 182584940
Change-Id: I8b27b397bce1708a42b96b1b647c64e23142c468
2021-05-10 19:50:49 +02:00
Wesley Wang
e19d238d18
Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev
2021-05-10 17:01:28 +00:00
Wesley Wang
56488ef84b
Merge "Update battery usage summary" into sc-dev
2021-05-10 17:00:07 +00:00
Julia Reynolds
333b68d059
Merge "Handle NLS metadata when provided as strings" into sc-dev
2021-05-10 15:56:35 +00:00
ykhung
4645fef6ca
Add searchable keywords for new usage and adaptive preferences screen
...
Bug: 185432878
Bug: 185433678
Bug: 185855057
Test: make SettingsRoboTests
Change-Id: Ibca47e7732f72cba03fbfae10075ac83f1938b43
2021-05-10 15:40:14 +00:00
TreeHugger Robot
9cb5ab3860
Merge "Fix work profile setting appearing too often" into sc-dev
2021-05-10 13:26:31 +00:00
Wesley.CW Wang
8d5010f6ec
Update battery usage summary
...
- Set up different summary for AOSP
Bug: 185855825
Bug: 187667156
Test: make SettingsRoboTests
Change-Id: I94dccfc325ecfcff8013fe4d3b5b65c427dcae5c
2021-05-10 13:03:12 +00:00
Wesley.CW Wang
25498983b2
Fix AdvancedPowerUsageDetailTest test error
...
Bug: 187693428
Test: make SettingsRoboTests
Change-Id: I3c3976b93a5dfb242af09bcfbf700a1caddd350b
2021-05-10 13:02:18 +00:00
Wesley.CW Wang
021e6b131f
Update battery status good icon color
...
screenshot: https://screenshot.googleplex.com/6eqfv3xBWp52gjg.png
Bug: 187608939
Test: make SettingsRoboTests
Change-Id: Ib4ac236ae77f624152e00e167e8035dab428b994
2021-05-10 10:25:36 +00:00
Tsung-Mao Fang
55ab3f91e5
Fix color contrast problem for VPN page
...
Test: A11y scanner doesn't show text contrast problem
Fix: 187399519
Fix: 181185518
Change-Id: I830a8b16d817bbdf2c68332e38fad0a15b87ce45
2021-05-10 09:54:12 +00:00
Tom Hsu
fa024d6fc8
Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev
2021-05-10 08:35:36 +00:00
Ryan Lin
4523f9200f
Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev
2021-05-10 07:27:46 +00:00
Syaoran Kuo
e37d12e5c4
Merge "Add more log for debugging resource id issue." into sc-dev
2021-05-10 07:17:28 +00:00