PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,830 Commits 1 Branch 0 Tags
beea0f190399779db84aaed5df7319f753f67e96
Commit Graph

80830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
8b51065a29 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: Id5713b46c14eb4ccf3caaad5c2f36231cb3ef45d
 2021-03-29 15:58:18 +00:00
Sunny Shao
11eabdf3e8 Merge "Fix runInstrumentableFragmentCodeInspection test case fail" into sc-dev 2021-03-29 15:18:32 +00:00
Wesley.CW Wang
e714393a20 Fix summary detector test fail am: ca048b51c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017667

Change-Id: I5ce3ca69afab064814f7fc44589bd774f139a792
 2021-03-29 14:56:35 +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
Jernej Virag
a0709ef797 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: I8189618c72cf1398c222ad1657b9244ea107f752
 2021-03-29 14:16:04 +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
844dcc684d 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: Ib8ec6635e72ea7e540c82a0e8e3cdc563b750fd8
 2021-03-29 10:03:50 +00:00
Tiffany Nguyen
6a8ca4062e Merge "Update BatterySettingsFeatureProvider signature." into sc-dev 2021-03-29 09:50:37 +00:00
Tsung-Mao Fang
4ebe8776e6 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: I837ce2bcd0f79627e43f74c1bc0edd4f48882adf
 2021-03-29 09:42:57 +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
355dd6caf4 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: I8ad15cd35008f4d2003b2ac27b68d98df35bd027
 2021-03-29 08:21:12 +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
Tsung-Mao Fang
490157525b Merge "Add collapsing toolbar to Device Admin Add page" into sc-dev am: 2a959d470a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13994990

Change-Id: I97ed4804ddb78e3b7dfdf512ea3345bc6e14933f
 2021-03-29 07:57:50 +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
e6bee66420 Merge "Add a reverse landscape layout for UDFPS" into sc-dev am: dc96037cea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13995001

Change-Id: I0a3198e59e730588789ec7421cdb9283ad10aff2
 2021-03-29 06:54:13 +00:00
Mill Chen
dc96037cea Merge "Add a reverse landscape layout for UDFPS" into sc-dev 2021-03-29 06:26:31 +00:00