Jay Aliomer
19fd698779
Merge "Notification history UI buff" into sc-dev am: 91b4a58111
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14037274
Change-Id: I03168e7fbd0a9a112d38f8d631e14a3eac2f3fe6
2021-03-30 20:32:03 +00:00
Fan Zhang
b6599ebede
Merge "More settings button add test" into sc-dev am: 2d58e29ad9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017673
Change-Id: If5a56f4cae6288aab31e0334a1604eff781f2137
2021-03-30 20:29:43 +00:00
Jay Aliomer
91b4a58111
Merge "Notification history UI buff" into sc-dev
2021-03-30 20:29:33 +00:00
Fan Zhang
2d58e29ad9
Merge "More settings button add test" into sc-dev
2021-03-30 19:41:33 +00:00
Jay Aliomer
5d10dbc732
Notification history UI buff
...
Fixes: 182155974
Test: visual test
Change-Id: I028381407504b3cf390987a6fa11c041fddf6198
2021-03-30 14:49:57 -04:00
Joshua Mccloskey
bf910b07f7
Merge "Added fingerprint strings" into sc-dev am: b904e94fcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13998808
Change-Id: Ib1f3d092c7288bb939d342cd6d95655dd285220c
2021-03-30 17:12:47 +00:00
Yu-Han Yang
e603c01a50
Merge "Untab Location Settings and tab Location Services" into sc-dev am: 60ddf8d7d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13985188
Change-Id: Ic175c1449e462005f59d87577ca8a55c220e257d
2021-03-30 17:12:29 +00:00
Yu-Han Yang
fee42664c6
Merge "Update links to Scanning Settings" into sc-dev am: 8d07eeb590
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13991364
Change-Id: I23d8797da8373503f92c6f2617ce03ce1d277525
2021-03-30 17:12:20 +00:00
Shireesha Bongarala
2043d31130
More settings button add test
...
Bug: 179063896
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=MoreSettingsPreferenceControllerTest
Change-Id: I99079165d32074ac0812bd62a146a9d238738fbc
2021-03-30 17:09:57 +00:00
Joshua Mccloskey
b904e94fcd
Merge "Added fingerprint strings" into sc-dev
2021-03-30 16:53:51 +00:00
Yu-Han Yang
60ddf8d7d4
Merge "Untab Location Settings and tab Location Services" into sc-dev
2021-03-30 16:48:38 +00:00
Yu-Han Yang
8d07eeb590
Merge "Update links to Scanning Settings" into sc-dev
2021-03-30 16:47:18 +00:00
Peter Kalauskas
ecd709bc95
Merge "Fix NPE in UserSettingsTest" into sc-dev am: 383ae7f025
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019935
Change-Id: Ie7a42e24e5f9f2991d10f80b637efcba4c61a0cb
2021-03-30 15:20:31 +00:00
Alex Johnston
e88933770f
Merge "RequestManageCredentials support RTL languages" into sc-dev am: 099a144869
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14018678
Change-Id: I9bbe5456e3c97f5d1b3d03a22812db517bfc8d4b
2021-03-30 15:18:47 +00:00
Peter Kalauskas
383ae7f025
Merge "Fix NPE in UserSettingsTest" into sc-dev
2021-03-30 15:01:16 +00:00
Alex Johnston
099a144869
Merge "RequestManageCredentials support RTL languages" into sc-dev
2021-03-30 14:52:49 +00:00
Julia Reynolds
c02136bf9a
Merge "Fix some 'clear recent issues'" into sc-dev am: 05c30a3f53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019938
Change-Id: Id5c02083fbdf39a2f95f8cf186a874d9faf3a949
2021-03-30 14:23:43 +00:00
Julia Reynolds
05c30a3f53
Merge "Fix some 'clear recent issues'" into sc-dev
2021-03-30 13:41:58 +00:00
Arc Wang
584cb0c107
Merge "Set icon for 'Free up space'" into sc-dev am: 495c51e3ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008237
Change-Id: I0b5e32e0bcec194896a5fa2fd2b3c2929cf3a21f
2021-03-30 12:38:26 +00:00
Arc Wang
495c51e3ac
Merge "Set icon for 'Free up space'" into sc-dev
2021-03-30 12:26:57 +00:00
Almaz Mingaleev
abbe6c1d5b
resolve merge conflicts of 7d9233302f to sc-dev am: dea929aa06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14032726
Change-Id: I8e347de420a89f694a454d54ae689dc8d5f0f150
2021-03-30 11:58:25 +00:00
Sunny Shao
e5fbde736b
Merge "Fix the "Add link" permanent disabled problem" into sc-dev am: 9bd9d299f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008226
Change-Id: Ice4510500b167c3d6db2693e090ab0b27fdb1a10
2021-03-30 11:58:23 +00:00
Weng Su
aad8754522
Merge "Fix the WifiTether test case failed" into sc-dev am: 9b86942fec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029853
Change-Id: I8de6fa020acc69f7826b5cb337de1d1ac902283b
2021-03-30 11:58:18 +00:00
Weng Su
d98401fdec
Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev am: 4e341b780a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13990616
Change-Id: Id44b304cceffa9b9ccd86c97e09dc4489eafc330
2021-03-30 11:57:45 +00:00
Almaz Mingaleev
dea929aa06
resolve merge conflicts of 7d9233302f to sc-dev
...
Change-Id: I7f6b7b035cc9c37a168e97ddeac5c8de9d5910de
2021-03-30 11:43:33 +00:00
Sunny Shao
9bd9d299f0
Merge "Fix the "Add link" permanent disabled problem" into sc-dev
2021-03-30 11:41:29 +00:00
Weng Su
9b86942fec
Merge "Fix the WifiTether test case failed" into sc-dev
2021-03-30 11:34:13 +00:00
Weng Su
4e341b780a
Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev
2021-03-30 11:32:57 +00:00
Arc Wang
8c4797471e
Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev am: 21cf6c04db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13994999
Change-Id: I6dedff439e7084e20f06ec19a0c42b8cf5f8bfc2
2021-03-30 11:19:38 +00:00
Arc Wang
bd9ec463f0
Merge "Show "Files" category for public storage in Storage Settings" into sc-dev am: dd2f2f51e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975110
Change-Id: Id05145905dc5043630fd696f530fc8365c97b680
2021-03-30 11:18:06 +00:00
Arc Wang
44f685475b
Set icon for 'Free up space'
...
Bug: 174964885
Test: manual visual
Change-Id: Icccf5413e400320396a100173f2a2c57acdd2ca6
2021-03-30 19:01:55 +08:00
Arc Wang
21cf6c04db
Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev
2021-03-30 09:49:48 +00:00
Arc Wang
dd2f2f51e0
Merge "Show "Files" category for public storage in Storage Settings" into sc-dev
2021-03-30 09:48:04 +00:00
Almaz Mingaleev
7d9233302f
Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf am: 87273aab56
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336
Change-Id: I8cce932794d13dd8f9424883b9521a823583f335
2021-03-30 09:39:21 +00:00
Weng Su
b63e672fa8
Fix the WifiTether test case failed
...
- Use the same service name(WifiManager.class) to mock
WifiManager.class
- Use the same service name(TetheringManager.class) to mock
TetheringManager.class
Bug: 184018452
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTether
Change-Id: I64741818d3455154866097f83e3a96c1c510e23b
2021-03-30 17:13:58 +08:00
Almaz Mingaleev
87273aab56
Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336
Change-Id: If30061d2e580c2cbb0a9ca2dc00f66604264a02d
2021-03-30 08:57:53 +00:00
Almaz Mingaleev
2cd0b0aadf
Merge "Allow alternative time zone ID to be set device's zone."
2021-03-30 08:33:37 +00:00
Arc Wang
78bafc988a
Check config to decide if Smart Storage toggle should exist
...
Bug: 174964885
Test: AutomaticStorageManagementSwitchPreferenceControllerTest
Change-Id: I3090e3d1b01b18b3d0f68396671c8791321cc480
2021-03-30 07:58:37 +00:00
Mill Chen
8f8d205639
Merge "Update lock pattern for landscape" into sc-dev am: ad8a4029c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14025285
Change-Id: I28ef8858571f56de973a6daa0b9ea08da0405daa
2021-03-30 07:56:09 +00:00
TreeHugger Robot
1bc67251d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d9eda0aed1 -s ours am: 1dc5a0cd38 -s ours am: 52bfe9c50a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14023261
Change-Id: Ia6d58b7964c6d7fe5aa44c07f55202e365771055
2021-03-30 07:56:05 +00:00
Bill Yi
f384448807
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb332bcf06 -s ours am: 859ab82e71 -s ours am: 04c45ca921 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14023259
Change-Id: I299df12691a54e8c37b2b57257804964c88571c8
2021-03-30 07:55:35 +00:00
Arc Wang
c626380689
Show "Files" category for public storage in Storage Settings
...
Users can click this preference to see public storage files
in external file browsers.
Bug: 170918505
Test: make RunSettingsRoboTests ROBOTEST_FILTER=StorageItemPreferenceControllerTest
manual
Select private storage and public storage and observe UI
Change-Id: If3f0d59b2ebf941d70e81e60c4c2015b80e7cf33
2021-03-30 15:51:49 +08:00
Sunny Shao
ace3cb8122
Fix the "Add link" permanent disabled problem
...
- Update setEnabled of the "Add link" while UI change.
Fixes: 183797700
Test: manual test
Change-Id: Ia6dad313ab752ccbe7313f6a4cdf759b02dff728
2021-03-30 15:51:43 +08:00
Mill Chen
ad8a4029c3
Merge "Update lock pattern for landscape" into sc-dev
2021-03-30 07:24:17 +00:00
TreeHugger Robot
52bfe9c50a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d9eda0aed1 -s ours am: 1dc5a0cd38 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14023261
Change-Id: Id3ca3c96a0e60aa76e02267eefe2dfdcd370224f
2021-03-30 07:14:46 +00:00
Bill Yi
04c45ca921
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb332bcf06 -s ours am: 859ab82e71 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14023259
Change-Id: I5bcbc5c26f13c2a3b04afc79ae67d23dff88080d
2021-03-30 07:14:26 +00:00
Wesley Wang
beea0f1903
Merge "Reset smart battery page switch component" into sc-dev am: 4559d22e51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017668
Change-Id: Iad6345518b6c3896221b4bcb383d07339f9386de
2021-03-30 06:48:45 +00:00
TreeHugger Robot
1dc5a0cd38
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d9eda0aed1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14023261
Change-Id: Ia5030bc815a27ec6e7049545c4bc1770a7fa838f
2021-03-30 06:48:20 +00:00
Bill Yi
859ab82e71
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb332bcf06 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14023259
Change-Id: I00110a86367afac679541a1777489205fa97c5d5
2021-03-30 06:48:16 +00:00
TreeHugger Robot
d9eda0aed1
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-30 06:24:26 +00:00