Commit Graph

81697 Commits

Author SHA1 Message Date
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
Weng Su
2206513a4e 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: If9abdd3046d5811760ef93803aefb9a4d92f6ff2
2021-03-30 03:26:03 +00:00
Weng Su
a69a6b7045 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: I2376c09cd8d970cf93030a30e905aecfdb86a939
2021-03-30 03:25:58 +00:00
Weng Su
886701c344 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: If58284817f89292298162a4d3ca0d6a7d8ad6f7c
2021-03-30 03:25:54 +00:00
Weng Su
cbc4f34abc 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: Ib8389152a599773fd3cff58d15f0c6cc92be3b5a
2021-03-30 03:25:50 +00:00
Weng Su
c1f4e51963 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: I88551d806bc034daf463894609b0bd02cb6fe791
2021-03-30 03:25:01 +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
Weng Su
982e6d3c1e Merge "Fix WifiTetherFooterPreferenceControllerTest failed" into sc-dev 2021-03-30 03:02:09 +00:00
Bill Yi
0b2ae5a68f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5ede9d88bd047f9d7a5f2f932736593beda3d3af
2021-03-29 19:58:30 -07:00
ykhung
3828724b76 Export methods from BatteryEntry and controller for battery usage
Export getting icon and name function as static method in the
BatteryEntry for further restoring from database history records, and
export the mBatteryConsumer to record the type into local database.

Bug: 183906918
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Ib3f0a457c8265baf0f6b97798bef0ea4a7156070
2021-03-30 10:55:55 +08:00
Weng Su
b66207d17a Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev 2021-03-30 02:39:51 +00:00
Bill Yi
bb332bcf06 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibc4689e62ec0e346015676571e920106ac05960a
2021-03-29 19:09:43 -07:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)"
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
2021-03-30 00:51:15 +00:00
Peter Kalauskas
d7a8b0eb21 Fix NPE in UserSettingsTest
Also, introduce a check for ACTION_USER_GUEST_ADD being logged correctly

Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Bug: 183920589
Change-Id: Ie4fdf4b3429a9abec64120a38a13f2d8a3fa121a
2021-03-29 15:54:01 -07:00
Julia Reynolds
4b301dba7a Fix some 'clear recent issues'
- Don't show the button if nothing is clearable
- Optimistically remove preferences on pressing clear since the actualy
clear action is asynchronous

Test: RoboTests
Fixes: 178765511
Change-Id: Ic305d4d199b149078ea52a614cb93cebe55cd245
2021-03-29 17:43:31 -04:00
Weng Su
41c8a68dab Ignore WifiNoInternetDialogTest failed test cases
Bug: 183920404
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNoInternetDialogTest

Change-Id: Ib69c982913d271be3c5fb85dd15fb06a9af021f8
2021-03-30 04:34:06 +08:00
Weng Su
416bdecfa4 Fix WifiTetherSettingsTest failed
- Use the same service name(Context.USER_SERVICE) to mock
UserManager.class

Bug: 183922231
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Ifa9f3affbb969425acea335732ce977f18f82b49
2021-03-30 04:02:24 +08:00
Weng Su
6f2379bb44 Fix WifiTetherSSIDPreferenceControllerTest failed
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183922071
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiTetherSSIDPreferenceControllerTest

Change-Id: I68955d83693dda787132e2a951e8d034e57090ce
2021-03-30 03:42:10 +08:00
Weng Su
8abe0dfb92 Fix WifiTetherPasswordPreferenceControllerTest failed
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183921878
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiTetherPasswordPreferenceControllerTest

Change-Id: Ib6ec5a806b10e73a5fefd4acf070a4ab1f69e0d7
2021-03-30 03:31:50 +08:00
Joshua Mccloskey
6ea4ba46b0 Added fingerprint strings
Test: It builds.
Bug: 182717125
Change-Id: I1f637ae68119f0b2239dedd424aec4556d339395
2021-03-29 12:20:46 -07:00
Weng Su
98746308cc Fix WifiTetherFooterPreferenceControllerTest failed
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183921868
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest

Change-Id: I904c463f555c3c3c2a85272505215cf993474a7a
2021-03-30 03:17:52 +08:00