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
91d9b370e1
Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2 am: 16fe59dab7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919
Change-Id: Idee5d47d7440e9f39d5de873413d3aa1869a2405
2021-05-11 04:21:27 +00:00
YUKAI HUNG
16fe59dab7
Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919
Change-Id: I7cef4dd0725ed2fe30ab23806a27ede46add4b70
2021-05-11 04:06:17 +00:00
YUKAI HUNG
f8d7036bcb
Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919
Change-Id: If0210c8d87497fce595a13025a2bc69235f43981
2021-05-11 04:04:31 +00:00
YUKAI HUNG
b8ce43a2ef
Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919
Change-Id: I64d03130973664aed40579ef3c669e5c1906b594
2021-05-11 04:04:08 +00: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
Jason Chiu
b22d9bdb0e
Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69 am: ad838712ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412
Change-Id: I8b6ffc80e01b77a40d5931a423f8600ed7cbb674
2021-05-11 03:13:16 +00: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
ad838712ed
Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412
Change-Id: I12fb430c12a6409e770108a0cf5f7448fad5a14e
2021-05-11 02:57:36 +00:00
Jason Chiu
3ea3c99e16
Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412
Change-Id: I66faa39d0996256e30111f8ce13d735ecd989299
2021-05-11 02:55:37 +00:00
Jason Chiu
66735de547
Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412
Change-Id: I083254cc4165b4dc1ef189fa7acbdf5f39042f75
2021-05-11 02:55:35 +00: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
3d615d4e16
Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18 am: c06523741c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918
Change-Id: Id242d32c6f35e9301bf27aa229bb5f27ca8e2b7c
2021-05-10 17:34:43 +00:00
Wesley Wang
2e663eb5e9
Merge "Update battery usage summary" into sc-dev am: 56488ef84b am: d591642bb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916
Change-Id: I348da0b49153cb3d35d9d0a61760decb4b43e8cf
2021-05-10 17:34:14 +00:00
Wesley Wang
c06523741c
Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918
Change-Id: I9e5f1c75d9eac0bce0b4ca7582362d6154d1a48b
2021-05-10 17:19:08 +00:00
Wesley Wang
d591642bb7
Merge "Update battery usage summary" into sc-dev am: 56488ef84b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916
Change-Id: I13035b036a2ad7956506d217edd22375b5a74d39
2021-05-10 17:18:31 +00:00
Wesley Wang
cdf99ec2da
Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918
Change-Id: I7567c92a1ecef0e8381ea38805df4e3ca92558ec
2021-05-10 17:17:52 +00:00
Wesley Wang
180e63c0b8
Merge "Update battery usage summary" into sc-dev am: 56488ef84b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916
Change-Id: I9fa451611e4abfab6cfcbf25864485b28ca6e7e3
2021-05-10 17:17:07 +00:00
Wesley Wang
a28add07a2
Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918
Change-Id: Iccee9abb5b2e1676a545a9c8aedcf29f522dd531
2021-05-10 17:16:20 +00:00
Wesley Wang
e15e791a04
Merge "Update battery usage summary" into sc-dev am: 56488ef84b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916
Change-Id: I095a6175559605484a592b1582238239dc272d52
2021-05-10 17:16:12 +00: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
aef5f6adce
Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059 am: 9936e10d1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497
Change-Id: Icb677001b96709d18e1298428cdbc93a64b88e83
2021-05-10 16:20:56 +00:00
Julia Reynolds
044aeb767d
Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497
Change-Id: I5451f21c6519f20050e981ab868f233adeefb393
2021-05-10 16:02:20 +00:00
Julia Reynolds
9936e10d1e
Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497
Change-Id: Ia5229cbf3410aed9029d767a322f85ecb65df729
2021-05-10 15:59:02 +00:00
Julia Reynolds
468e4af75f
Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497
Change-Id: Id3f33a6a5aef2947d6b5d1dd54f92e28f9f15d2a
2021-05-10 15:57:09 +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
fcfd177aad
Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860 am: 82ddd0b57e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515
Change-Id: I3713e87abbdece69d4bafb65a946144ef20df3f3
2021-05-10 14:01:14 +00:00