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

80967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Wesley.CW Wang
292cbbfa18 Fix summary detector test fail am: ca048b51c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017667

Change-Id: I6af92d11320ab894b81b5aaddefc3d4b09a4d25f
 2021-03-29 14:48:29 +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
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
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
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
2f8e8dcb5e 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: I0f90ab6ed39ca7041335482bae56ca6bdddf6c5e
 2021-03-29 07:57:32 +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