PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,858 Commits 1 Branch 0 Tags
ee3cf38f886d4221f2ac10c8afd96f5f87ce8046
Commit Graph

101858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Silva
ee3cf38f88 Merge "Update screen saver overlay toggle description" into tm-dev am: 7b9593761a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I3c5ebb9243dc9f4f6cf23277b4b7fdbaf37fa925
 2022-03-23 22:48:34 +00:00
Yi Jiang
2260f2e9cc Merge "Moves battery saver warning message below Screen Attention setting." 2022-03-23 22:41:44 +00:00
Lucas Silva
7b9593761a Merge "Update screen saver overlay toggle description" into tm-dev 2022-03-23 21:56:59 +00:00
Lucas Silva
e5fa785dfa Merge changes from topic "presubmit-am-03ffa3d76b0646d890555c8d427704b5" 
* changes:
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 2p: 072d2beb83
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d
  Update screen saver overlay toggle description
 2022-03-23 21:56:59 +00:00
TreeHugger Robot
3c431c8c7f Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c am: e9fae331a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: I9b6812d0e449b43fdab07a2b877279eef7c0c37a
 2022-03-23 20:31:49 +00:00
TreeHugger Robot
e9fae331a5 Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: Ic3909624df98329c215eb400aeee0d9d4838a0fe
 2022-03-23 20:14:25 +00:00
TreeHugger Robot
80bb0d7986 Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: Ic42a9fdf552b40d300604ee1a04b4d28f6eac3bc
 2022-03-23 20:14:07 +00:00
TreeHugger Robot
e7f902f21c Merge "Add summary to "Vibration & haptics" settings" into tm-dev 2022-03-23 19:58:55 +00:00
TreeHugger Robot
b81c42d043 Merge "Fix System language option missing and locale region missing issue" 2022-03-23 18:16:07 +00:00
TreeHugger Robot
0cad38f06f Merge "[Panlingual][patch] Handle onLocaleSelected." 2022-03-23 18:16:07 +00:00
Lucas Silva
4bfc3ea2d1 [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 2p: 072d2beb83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: Ia1067f8cc23c198c42209ae0f40f4b6ee2a06031
 2022-03-23 17:31:24 +00:00
Lucas Silva
072d2beb83 [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I3c000b5d042373d8617f6648e4957dd7c57dd8f9
 2022-03-23 17:31:18 +00:00
Lucas Silva
0f29d1562d Update screen saver overlay toggle description 
Change-Id: I6baab768fd845211e0d0eaf98b6a59cff4e25832
 2022-03-23 17:31:00 +00:00
Yi Jiang
70128d9016 Moves battery saver warning message below Screen Attention setting. 
Test:  make RunSettingsRoboTests -j40
Bug: 220252566
Change-Id: Ib51a0d73c13700c981d1ca789d2ab669e57d814d
 2022-03-23 15:52:35 +00:00
Chaohui Wang
c22c9f0eb2 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451 am: ba394bec83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: I8ace1f8f19841f659dfaa8427023acbace4ea237
 2022-03-23 13:49:24 +00:00
Chaohui Wang
ba394bec83 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: I49044c2b8fd210d20ed6437f9e1cad0e081644fd
 2022-03-23 13:22:17 +00:00
Chaohui Wang
1ad2b83207 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: Ic1e2a5c85f2e7ebb2b78ff9dcabc359d4ae032f5
 2022-03-23 13:22:12 +00:00
Chaohui Wang
8ba7ed6451 Merge "Fix SetupChooseLockPasswordTest" into tm-dev 2022-03-23 13:09:19 +00:00
Lais Andrade
68d7b91bb1 Add summary to "Vibration & haptics" settings 
Use VIBRATE_ON main toggle to display on/off state as summary for
"Vibration & haptics" settings provider.

Fix: 220218654
Test: VibrationPreferenceControllerTest
Change-Id: Ifd4b9c7b1cb68ad0ea535091804a1e7f54297c44
 2022-03-23 12:14:52 +00:00
Chaohui Wang
1933ffacab Fix SetupChooseLockPasswordTest 
Test fail is caused by method getVisibleScreenLockTypes() renamed to getVisibleAndEnabledScreenLockTypes() in
https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/14269154

Fix: 201021223
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password.SetupChooseLockPasswordTest"
Change-Id: Idcc7a9794217c1ef81ca4a26351e26773b18ccad
 2022-03-23 17:19:21 +08:00
TreeHugger Robot
9547b59c96 Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8e8 am: e8334d9bb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: Ib9f2d513d48eafa014498a549c7dd26e6ed67014
 2022-03-23 09:10:08 +00:00
TreeHugger Robot
e8334d9bb1 Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: I4bf75ada3b1291d0a457d424c82fd266f0a2949f
 2022-03-23 08:47:53 +00:00
TreeHugger Robot
5068ff38b7 Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: If7f7edcd139a5f9a651c9e089380643dcd2b3bdf
 2022-03-23 08:47:35 +00:00
TreeHugger Robot
a12da0a8e8 Merge "Fix adding wifi configuration issue" into tm-dev 2022-03-23 08:27:47 +00:00
TreeHugger Robot
d31cf63d33 Merge "Add visibility control for the UiBlocker" into tm-dev am: a387297687 am: 2bba6ac214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119094

Change-Id: I59ba7efe945b31f7a3468146adf208b8b4fdb155
 2022-03-23 08:27:34 +00:00
TreeHugger Robot
7dc9691d35 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73 am: 47f05534d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I7248a3bed62623afb1abc96476db23841227d617
 2022-03-23 08:26:29 +00:00
TreeHugger Robot
2bba6ac214 Merge "Add visibility control for the UiBlocker" into tm-dev am: a387297687 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119094

Change-Id: Ie0493ba0da7865dcbc4fe9cd1b20e079664d7781
 2022-03-23 08:18:35 +00:00
TreeHugger Robot
ca1bcca0d1 Merge "Add visibility control for the UiBlocker" into tm-dev am: a387297687 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119094

Change-Id: I307600f9bd7a719d3110471de247f5be00d91b75
 2022-03-23 08:18:23 +00:00
TreeHugger Robot
a387297687 Merge "Add visibility control for the UiBlocker" into tm-dev 2022-03-23 08:14:46 +00:00
TreeHugger Robot
47f05534d2 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I3a4865ccc802fa80256965b080977bef9891e50c
 2022-03-23 08:11:11 +00:00
TreeHugger Robot
5c1e297131 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I2f3e5559c012457715257e5734121ae936f99782
 2022-03-23 08:11:00 +00:00
TreeHugger Robot
764d7f4b73 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev 2022-03-23 08:00:05 +00:00
Calvin Pan
c117a89a53 Fix System language option missing and locale region missing issue 
- Taking app package name into LocalePickerWithRegion
- Using toLanguageTag() instead of getLanguage() to prevent locale
 region missing

Bug: 226278910
Bug: 226280740
Change-Id: Ieac42616192065abc0cf82db023e4e50f1ca562d
Test: To be verified
 2022-03-23 07:48:10 +00:00
TreeHugger Robot
e7dc92220a Merge "Update the string" into tm-dev am: 53fa29af01 am: 4de69b01a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341684

Change-Id: I384a392b1937ebfffc5953979c899a4b47172622
 2022-03-23 07:28:36 +00:00
Gary Jian
b568fdbe47 Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da am: e1356cdb64 am: 47e14df7cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I225e5177122de52bce9ced4854fcd01139094a5c
 2022-03-23 07:27:49 +00:00
TreeHugger Robot
5f1205dbb7 Merge "Update the string" into tm-dev am: 53fa29af01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341684

Change-Id: I68792833ff9c35840232c8bf0f50774f79b2ae78
 2022-03-23 07:26:43 +00:00
TreeHugger Robot
4de69b01a3 Merge "Update the string" into tm-dev am: 53fa29af01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341684

Change-Id: I630c98bc22722afb09a0a835b570c2b6776d8d39
 2022-03-23 07:26:28 +00:00
TreeHugger Robot
53fa29af01 Merge "Update the string" into tm-dev 2022-03-23 07:11:54 +00:00
Gary Jian
47e14df7cb Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da am: e1356cdb64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I71c344d0c3eea2f26c6d0ab4db2bf28e28cb65ff
 2022-03-23 07:04:26 +00:00
Gary Jian
abbccaf748 Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da am: e1356cdb64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I551760d32c0bea35118fae7b579f0283fedaea15
 2022-03-23 07:04:19 +00:00
Gary Jian
e1356cdb64 Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I12e5aa6274b2db7f70a231d8b6512f40d32ff8a9
 2022-03-23 06:56:17 +00:00
Gary Jian
24888461da Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: Icbe95d63e86ef204fec957757a8f8b49ef77ac82
 2022-03-23 06:34:55 +00:00
Gary Jian
41ec2bc89b Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: Ia08609cddc63034e3f9d02f64727d92fe9e2348f
 2022-03-23 06:11:41 +00:00
Gary Jian
78b2b241a9 Merge "Add a developer option to controll mockmodemservice permission" 2022-03-23 05:46:22 +00:00
Kevin Han
94eeb2d611 Merge "Update hibernation toggle string" into tm-dev am: 46adb8e175 am: 7c8166e851 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17304592

Change-Id: I8fbf7dea33fd401a0df8e12eb4446fcfa27630e4
 2022-03-23 04:53:29 +00:00
Kevin Han
22f532e6f3 Merge "Update hibernation toggle string" into tm-dev am: 46adb8e175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17304592

Change-Id: Ibe0d63375342ee268619b4c3d5bb737cab1dfa74
 2022-03-23 04:38:02 +00:00
Kevin Han
7c8166e851 Merge "Update hibernation toggle string" into tm-dev am: 46adb8e175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17304592

Change-Id: Ibd698dd496b29770d5f1112871408e96cf0ff32e
 2022-03-23 04:37:43 +00:00
Kevin Han
46adb8e175 Merge "Update hibernation toggle string" into tm-dev 2022-03-23 04:24:38 +00:00
SongFerng Wang
cc48d8a92e Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e am: eefaf62ba7 am: 08e5d43e54 am: 210a422be0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I34e0a9ed287a521b387199d1f1bdbd18aa122aff
 2022-03-23 03:39:51 +00:00
SongFerng Wang
c9e1a00fea Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e am: eefaf62ba7 am: 08e5d43e54 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I08863750462b894c6d06f436b77fe6f2b9185ea9
 2022-03-23 03:19:15 +00:00