Yu-Han Yang
6b7ae6b75e
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: Icd9ff01202d4fd4135b79f03eb5df5a9c1cc04b1
2021-03-30 17:10:11 +00:00
Yu-Han Yang
d822c05cdf
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: I00757cd497f322a174468f10edae756d9840ba6a
2021-03-30 17:10:04 +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
439a60643c
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: I3813fa74f48c043d9d539e8b9997e1a2a1edb40f
2021-03-30 15:19:39 +00:00
Alex Johnston
2f8d178435
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: Id19b8324a3d5154697d90599a0d56def215b9448
2021-03-30 15:18:07 +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
b3b92c996c
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: Id5244f754140fdd68097407798363a62caec3087
2021-03-30 14:21:49 +00:00
Julia Reynolds
05c30a3f53
Merge "Fix some 'clear recent issues'" into sc-dev
2021-03-30 13:41:58 +00:00
Arc Wang
2be3195f5e
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: Iad479cdc536f879a9dcd46d2c4b9a068263009c6
2021-03-30 12:38:04 +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
edd4dea232
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: I3ce506516ee7e9f6ff4581705e4c150d10faa26b
2021-03-30 11:58:28 +00:00
Sunny Shao
9798dc06fe
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: Ifde95d1793692e83cfff5cef45d20047d5d1a149
2021-03-30 11:58:24 +00:00
Weng Su
2c8e759692
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: I312a83e3f07dd28658b744a73d51675d2486c115
2021-03-30 11:58:19 +00:00
Weng Su
045b3eba93
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: I5845d9691397f86ade3e69279d8e9c33a6f53b99
2021-03-30 11:57:01 +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
5db8f5ae05
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: Ib25fad04992539fb95bc32870a0ea28ab562a8c0
2021-03-30 11:18:35 +00:00
Arc Wang
71ec654fcc
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: Iea8ea56dfa32eca83adeb75b5fc98668af017b80
2021-03-30 11:18:15 +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
dc67195a45
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: Idca74002b472c842e403d8b269b693a6aea67476
2021-03-30 07:55:57 +00:00
TreeHugger Robot
2ad271e563
[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: If7548edf6d85b556f55e7dcc1c9a191c270e8d9b
2021-03-30 07:55:51 +00:00
Bill Yi
b606c8243d
[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: Ie9c2859f23e6bac61cd797d92dd5733de448d6a4
2021-03-30 07:55:44 +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
9d58d7455e
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: I723254c68196c75607d21d89a400164fee908abf
2021-03-30 06:48:44 +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
Wesley Wang
4559d22e51
Merge "Reset smart battery page switch component" into sc-dev
2021-03-30 06:15:00 +00:00
Bonian Chen
e12af7c44d
Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev am: fecfb7f5e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14022667
Change-Id: If7b7aed4d406cea84e118a9b8f9c29ae6206287d
2021-03-30 05:37:24 +00:00
YUKAI HUNG
6d80b45b15
Merge "Export methods from BatteryEntry and controller for battery usage" into sc-dev am: c0c7d4a5cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008232
Change-Id: I71233bfa5cc56bb34e30dce628ae02fba1a9a681
2021-03-30 05:36:44 +00:00
Bonian Chen
fecfb7f5e4
Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev
2021-03-30 05:31:52 +00:00
YUKAI HUNG
c0c7d4a5cc
Merge "Export methods from BatteryEntry and controller for battery usage" into sc-dev
2021-03-30 04:51:11 +00:00
Mill Chen
0cbd13d0df
Update lock pattern for landscape
...
- Using GlifLayout api to set title and description
- Hide the header area for landscape mode
Bug: 179317709
Test: visual verified
1) Settings -> Security -> Screen lock -> Pattern
2) Try setting screen lock if there's no pattern
3) Rotate the screen during the settings flow and see if there's
an empty space leaving in the left side
4) Settings -> Security -> Fingerprint
5) Device will display a confirm lock pattern page
6) Rotate the screen and see if there's an empty space left
Change-Id: I16f614eceb873f40b7c48583223aedcbcbd7447d
2021-03-30 11:51:08 +08:00
Weng Su
e8bd222753
Merge "Fix the broken test on WifiSettingsTest" into sc-dev am: ae80253161
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017674
Change-Id: I1f8507c06c8ebff22a7f7c3dcf7321c389f768dd
2021-03-30 03:26:12 +00:00
Weng Su
9950c9913d
Merge "Ignore WifiNoInternetDialogTest failed test cases" into sc-dev am: 39bc92d1bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017681
Change-Id: I7e6f5b7d55fd59f81d0666980befe7ad58d11880
2021-03-30 03:26:07 +00:00