Commit Graph

80321 Commits

Author SHA1 Message Date
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
Wesley Wang
4559d22e51 Merge "Reset smart battery page switch component" into sc-dev 2021-03-30 06:15:00 +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
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
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
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
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
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
Weng Su
f5b4e49073 Fix the broken test on NetworkProviderSettingsTest
- Set the Provider Model feature flag to false

Bug: 183919739
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I44cfbe314ce82d67f10fe717054129ee849870a1
2021-03-30 01:58:07 +08:00
Weng Su
b91aa1edba Fix the broken test on WifiSettingsTest
- Use the same service name(Context.USER_SERVICE) to mock
UserManager.class

- Set the Provider Model feature flag to false

Bug: 183921235
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest

Change-Id: I7f83431c08f1e2bd61be0d4b7894116fa7d60168
2021-03-30 01:44:50 +08:00
Sunny Shao
11eabdf3e8 Merge "Fix runInstrumentableFragmentCodeInspection test case fail" into sc-dev 2021-03-29 15:18:32 +00:00
Wesley.CW Wang
ca048b51c5 Fix summary detector test fail
Bug: 183919477
Test: make RunSettingsRoboTests -j40
Change-Id: I879c07e1c44a6e17ea9ceaca85ec4778e0131c5d
2021-03-29 14:33:09 +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
Tiffany Nguyen
6a8ca4062e Merge "Update BatterySettingsFeatureProvider signature." into sc-dev 2021-03-29 09:50:37 +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
e2217fc5c5 Merge "Update Battery settings main page string (1/2)" into sc-dev 2021-03-29 07:59:34 +00:00
Tiffany Nguyen
7a86b63115 Update BatterySettingsFeatureProvider signature.
Test: no-op
Bug: 181827717

Change-Id: I891452f0195e712dd775f458b16f985c63803370
2021-03-29 07:57:52 +00:00
Jernej Virag
4f1e17eba1 Create a setting for Assist invocation via long press power button
Adds a setting which allows the user to enable invoking the Assist app via long pressing the power button. The availability of setting is controlled by config_longPressOnPowerForAssistantSettingAvailable configuration value.

Bug: 179175321
Bug: 182983853
Test: make RunSettingsRoboTests
Change-Id: I2eb23e5b7539b2fb8e5bc85d23ca5795a08366c5
2021-03-29 07:57:13 +00:00
Tsung-Mao Fang
2a959d470a Merge "Add collapsing toolbar to Device Admin Add page" into sc-dev 2021-03-29 07:32:20 +00:00
Tsung-Mao Fang
ff727efe7b Follow footer preference guildance on some pages
- Footer preference should have a info icon in tethering page.
- Rmove an empty icon for screen attention setting.
- Revise the "More details" to "Learn more"
- Add more empty line between footer info and "Learn more"

Test: Built apk, and check the screen
Fix: 183472971
Fix: 183472858
Change-Id: I7edb71639b59efb8205c0ef6a50ab483f88aa63d
2021-03-29 15:26:59 +08:00
Mill Chen
dc96037cea Merge "Add a reverse landscape layout for UDFPS" into sc-dev 2021-03-29 06:26:31 +00:00
Mill Chen
474093e8cc Add a reverse landscape layout for UDFPS
Bug: 181614043
Test: visual verified
1) Settings -> Security -> Fingerprint
2) Follow the setup flow to find sensor page and enrolling page
3) Rotate your device and see if fingerprint icon is overlapping with
the title.

Change-Id: Ia1202e9688f2472c8063287164f4fc8f479cdae9
2021-03-29 11:53:13 +08:00
TreeHugger Robot
772065e0d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b004856084 -s ours am: 9bd8924364 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14009295

Change-Id: I463a50b92e85b431ceb2cca8fa15fa9914f8b3f7
2021-03-27 07:56:51 +00:00
Bill Yi
bef0130250 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d39189020 -s ours am: 00f6d40299 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14009297

Change-Id: I18a207744a6ee55a2d186225fe047bbb78eff4f5
2021-03-27 07:56:31 +00:00
TreeHugger Robot
9bd8924364 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b004856084 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14009295

Change-Id: Ie0d20a360f0763640c784cf9c0740628e7c05347
2021-03-27 07:10:20 +00:00
Bill Yi
00f6d40299 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d39189020 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14009297

Change-Id: I8e4eff582beebc7cdcc1fbe0f56de46a365f7f1d
2021-03-27 07:09:51 +00:00
TreeHugger Robot
b004856084 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-27 07:00:50 +00:00
Bill Yi
9d39189020 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I255c64ba434ed52927c5ba5e93d2c04a9c455efc
2021-03-26 22:00:29 -07:00
Bill Yi
93b834142b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie8e82cf7a7a752585e7e9e396004b0e88581b705
2021-03-26 21:11:53 -07:00
Dmitri Plotnikov
6af63e3b07 Merge "Adjust consumed power for SystemBatteryConsumers" into sc-dev 2021-03-26 14:31:35 +00:00
Arc Wang
fd9c0c7e90 Merge "Launch StorageDashboardFragment instead of StorageSettings" into sc-dev 2021-03-26 07:36:07 +00:00
Peter Wang
f7586147f8 [automerger skipped] Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a am: 5ef6e587c1 -s ours
am skip reason: skip tag Change-Id I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2 with SHA-1 2404806afb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: Ic75da4ead3956744f02d7f5d7036896bed2c7416
2021-03-25 22:18:21 +00:00
Peter Wang
5ef6e587c1 Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I82d7a91f9136998b8b438627ed68248a22c1dfa6
2021-03-25 21:36:39 +00:00
Soonil Nagarkar
75703b3993 Merge "Remove dynamic location settings footer" into sc-dev 2021-03-25 21:08:32 +00:00
Peter Wang
2f30e9107a Merge "Fix coding styles for erase euicc only options" am: d3db03b520
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I0d7be5bf2e40af9a0c345be284a5bcc2058ebc8e
2021-03-25 20:50:10 +00:00
Peter Wang
d3db03b520 Merge "Fix coding styles for erase euicc only options" 2021-03-25 20:14:54 +00:00
Peter Wang
5babfac3d1 Fix coding styles for erase euicc only options
Bug: 159650638
Test: Build
Change-Id: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
Merged-In: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
2021-03-25 11:13:29 -07:00
Ahaan Ugale
2e46cdb287 Merge "Update summary for Passwords and Accounts." into sc-dev 2021-03-25 16:22:46 +00:00