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
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
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
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
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
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
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
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
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
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
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
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
Alex Johnston
b7867817d0
RequestManageCredentials support RTL languages
...
* App name and URIs should be displayed to the
left of the app icon for right-to-left
languages e.g. arabic.
Manual testing steps:
* Set language as Arabic
* Install TestDPC and select 'Request to
manage credentials'.
* Verify app name and URLs are correctly displayed.
* Go to Settings > Security > Encryption & Credentials
> Credential management app and verify apps and URIs
are displayed corretly.
Bug: 170627997
Test: Manual testing
Change-Id: Id383e5d92022fc2e40494fadb12c64a46b1f6a65
2021-03-29 18:29:15 +00:00
Sunny Shao
164692eb20
Merge "Fix runInstrumentableFragmentCodeInspection test case fail" into sc-dev am: 11eabdf3e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017670
Change-Id: I2dc10e0542b76374405c5d6c45d7dcf2c87f23e2
2021-03-29 15:51:27 +00:00
Sunny Shao
11eabdf3e8
Merge "Fix runInstrumentableFragmentCodeInspection test case fail" into sc-dev
2021-03-29 15:18:32 +00:00
Jernej Virag
2fd49165eb
Merge "Create a setting for Assist invocation via long press power button" into sc-dev am: 0a0721fb8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13921369
Change-Id: I3fc6f35d63d9767b8d6e18c2f32a08c62f5162f4
2021-03-29 14:15:59 +00:00
Sunny Shao
13f36a58dc
Fix runInstrumentableFragmentCodeInspection test case fail
...
- Replace DialogFragment with InstrumentedDialogFragment.
- Remove the redundant code in the SupportedLinksDialogFragment.
Fixes: 183918543
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.core
Change-Id: I2a5eb97ec6669853f158a21695e49339aeb5808d
2021-03-29 22:00:04 +08:00
Jernej Virag
0a0721fb8a
Merge "Create a setting for Assist invocation via long press power button" into sc-dev
2021-03-29 13:52:14 +00:00
Wesley.CW Wang
5c8caa3154
Reset smart battery page switch component
...
- Reset the switch to default design
Bug: 178199757
Test: make RunSettingsRoboTests -j40
Change-Id: I698493a946d7c8daaac73bfd3aaab807244997b0
2021-03-29 10:55:50 +00:00
Almaz Mingaleev
dd2a685756
Allow alternative time zone ID to be set device's zone.
...
If America/Godthab is set as device time zone, display it as if
America/Nuuk is chosen.
If time zone is known, but is not an alternative and not shown
in time zone picker, region will de derived from user's locale.
Bug: 155738410
Test: atest com.android.settings.datetime.timezone.model
Test: set persist.sys.timezone via adb and checked
Date & Time screen
Change-Id: I168fb4319e144dbe9e2496d06a681d4c09b411c0
2021-03-29 11:18:57 +01:00
Tiffany Nguyen
9eca32944f
Merge "Update BatterySettingsFeatureProvider signature." into sc-dev am: 6a8ca4062e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13984446
Change-Id: I6a8006c6c79c2c69719076a735fddb9e2170bd67
2021-03-29 10:03:12 +00:00
Tiffany Nguyen
6a8ca4062e
Merge "Update BatterySettingsFeatureProvider signature." into sc-dev
2021-03-29 09:50:37 +00:00
Tsung-Mao Fang
3e8f738828
Merge "Follow footer preference guildance on some pages" into sc-dev am: 0dae5d005f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989773
Change-Id: Icba1862d5d5eb3ab8367b490d1892dc932ddf5c8
2021-03-29 09:43:01 +00:00
Tsung-Mao Fang
0dae5d005f
Merge "Follow footer preference guildance on some pages" into sc-dev
2021-03-29 09:14:32 +00:00
Wesley Wang
d8556c43e7
Merge "Update Battery settings main page string (1/2)" into sc-dev am: e2217fc5c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13994994
Change-Id: Ia466ce3c84adfb044339465f0dfcbc08b6587896
2021-03-29 08:21:01 +00:00