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
Wesley Wang
4559d22e51
Merge "Reset smart battery page switch component" into sc-dev
2021-03-30 06:15:00 +00:00
Bonian Chen
700c46fc9f
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: I276bbbce333624640af61355c753e11b6593e411
2021-03-30 05:36:51 +00:00
YUKAI HUNG
f211957d5a
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: I70bb97516f1cc2da3c0369707b83c9a901ad9d56
2021-03-30 05:36:27 +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
ecde9e19c7
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: Ic0194d94c6dc387bee2f4e358ff1ea7306349f4f
2021-03-30 03:26:11 +00:00
Weng Su
d37026926c
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: Iad4c7679a0a9bc68dcb8888b607f5367091efb32
2021-03-30 03:26:06 +00:00
Weng Su
48dfe9d311
Merge "Fix WifiTetherPasswordPreferenceControllerTest failed" into sc-dev am: 79fabbc249
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017678
Change-Id: Ifbb7eaea5d2e79e1dd31c2efb6d50bfe56392462
2021-03-30 03:26:02 +00:00
Weng Su
1f5fb00291
Merge "Fix WifiTetherSettingsTest failed" into sc-dev am: ec31a6884c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017680
Change-Id: I2c8ecbe41e15e943b24c2cf2f37391ad26935302
2021-03-30 03:25:58 +00:00
Weng Su
db0204eed9
Merge "Fix WifiTetherSSIDPreferenceControllerTest failed" into sc-dev am: cc9b424882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017679
Change-Id: I7033795deeb54db9cecd8946c01edd2f803f9d60
2021-03-30 03:25:54 +00:00
Weng Su
54bc85c919
Merge "Fix WifiTetherFooterPreferenceControllerTest failed" into sc-dev am: 982e6d3c1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017677
Change-Id: I4c4902a51ffa74347f320dd66c461945c98c7b4c
2021-03-30 03:25:50 +00:00
Weng Su
ecf268b983
Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev am: b66207d17a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017675
Change-Id: I828673ead66370360d76dbbd4776b6c8943d9dd0
2021-03-30 03:25:07 +00:00
Weng Su
ae80253161
Merge "Fix the broken test on WifiSettingsTest" into sc-dev
2021-03-30 03:03:36 +00:00
Weng Su
39bc92d1bc
Merge "Ignore WifiNoInternetDialogTest failed test cases" into sc-dev
2021-03-30 03:03:12 +00:00
Weng Su
79fabbc249
Merge "Fix WifiTetherPasswordPreferenceControllerTest failed" into sc-dev
2021-03-30 03:02:58 +00:00
Weng Su
ec31a6884c
Merge "Fix WifiTetherSettingsTest failed" into sc-dev
2021-03-30 03:02:43 +00:00
Weng Su
cc9b424882
Merge "Fix WifiTetherSSIDPreferenceControllerTest failed" into sc-dev
2021-03-30 03:02:27 +00:00