Commit Graph

102187 Commits

Author SHA1 Message Date
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
Jason Chang
24782cf8c3 Add checking if device should not support One-handed mode
shortcut widget

Check One-handed mode system property to enable/disable
One-handed mode shortcut widget.

Bug: 223754076

Test: manually add One-handed mode settings widget to check
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.shortcut.CreateShortcutPreferenceControllerTest"

Change-Id: I5b8f8e56d49be666967d2af66258b20ee5778205
2022-03-23 15:46:42 +08: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
Peter_Liang
5069aa7263 Fix that strings have the similar color as the background in preview section.
Add the text color attribute.

Fix: 225805027
Test: manual test
Change-Id: Ie914797920631ed8e096e27ecd6e1c8184ee4505
2022-03-23 05:43:37 +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
Kedar Chitnis
948dee1b6f Guest mode UX flow updates to user settings
- Add option in user settings to enable/disable ephemeral
  mode for guest user
- Update user settings to show exit guest and reset guest preferences
- Update user settings to show guest related preferences grouped together

Bug: 214031645, 175795666
Screenshots: go/ephemeral-guest-b-214031645-ux
Test: Manual test on sunfish, atest SystemUITests, atest SettingsRoboTests
Change-Id: I7cf205883f8250178ac24c67c74b9142ceb6c1f5
2022-03-23 03:42:37 +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
SongFerng Wang
210a422be0 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: I139f8be6d4dea2b92ba7e0676c83c01f235d50eb
2022-03-23 03:18:43 +00:00
Hugh Chen
b355af9a87 Update the string
Bug: 225982666
Test: build pass
Change-Id: I47a9a27fedcc657d1cbd41708607174486d33fc2
2022-03-23 03:04:23 +00:00
SongFerng Wang
08e5d43e54 Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e am: eefaf62ba7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

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

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

Change-Id: I98125699c5fe13fe7acbd7668be1e12b6bcedcd6
2022-03-23 02:11:19 +00:00
TreeHugger Robot
e3c72714e4 Merge "Remove myself from OWNERS." 2022-03-23 02:08:23 +00:00
SongFerng Wang
75869b5fef Merge "[LE adudio] The condition of right location is wrong." 2022-03-23 01:52:05 +00:00
Weng Su
f5cd7140f4 Fix adding wifi configuration issue
- The Wi-Fi Enterprise Restrictions add a new
  UserManager.DISALLOW_ADD_WIFI_CONFIG restriction from T.

- When a user requests to add Wi-Fi configuration, Settings will
  reject the request if the user is not allowed.

- The above restriction need to be retrieved in advance so that the
  user's request will not be rejected.

- See the result screenshot in b/224459753#comment8

Bug: 224459753
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivity

Change-Id: I2dfb6b9946dd9dbd4eb8bf0f6549ac5cb4466f17
2022-03-23 06:18:55 +08:00
Kweku Adams
cb369d3cf0 Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f am: 45b3c9f280
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: I268445fd2f6f1982273b07f47ae231b1fed776d1
2022-03-22 19:25:27 +00:00
Kweku Adams
bf86bbb5a7 Merge "Make reward constants configurable." into tm-dev am: 32edc913a7 am: 81e1f511d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I81d11ff81b193064640cd8fb07f879997d4e6350
2022-03-22 19:24:44 +00:00
Kweku Adams
f264728eaf Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: Ifefec87c41acdf4e8e47a78f82cd2aba809e9389
2022-03-22 19:08:04 +00:00
Kweku Adams
e1b959bbef Merge "Make reward constants configurable." into tm-dev am: 32edc913a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I366f2939c28b8a00b164c6912af59c6f717038ea
2022-03-22 19:07:43 +00:00
Kweku Adams
45b3c9f280 Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: If6df2836e323f94f99c4fd1a629ff015253a11b2
2022-03-22 19:06:45 +00:00
Kweku Adams
81e1f511d7 Merge "Make reward constants configurable." into tm-dev am: 32edc913a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I8fc365e90a44177b5f5dc25a9f8a9e513c36bb99
2022-03-22 19:06:38 +00:00
Kweku Adams
240e85be9f Merge "Fix inaccessible view issue." into tm-dev 2022-03-22 18:59:25 +00:00
SongFerngWang
418d78f978 [LE adudio] The condition of right location is wrong.
1. Fix the condition of right location.
2. If the location is left+right, showing the legacy battery style.

Bug: 225800014
Test: build pass. local test.
Change-Id: I03d1d7bfe26d52e0b69d24aec6bd3216350403a0
2022-03-23 02:55:06 +08:00
Yanli Wan
e80aad534a Merge "Update financed device info strings" 2022-03-22 18:53:27 +00:00
Eric Biggers
af587fd3df Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c am: 98ac6a6c01 am: b28d6c6c76
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: I61aac53cb4f668db3f092d8379bbf358ed3f5774
2022-03-22 18:51:28 +00:00
Kweku Adams
32edc913a7 Merge "Make reward constants configurable." into tm-dev 2022-03-22 18:45:36 +00:00
Eric Biggers
9e3afb97ca Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c am: 98ac6a6c01
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: I54f937fb29a9c16816911dc3e851b732e71b8c72
2022-03-22 18:32:34 +00:00
Eric Biggers
b28d6c6c76 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c am: 98ac6a6c01
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Icc017c4f8cfeba0e0d5eabcbb592337bf296fbf0
2022-03-22 18:31:43 +00:00
Weng Su
98d30c880d Fix ConnectivityManager.requestNetwork crash issue when try again
- When the user requests "try again", the Network-Request-Dialog will be
  recreated. If the Wi-Fi framework sends the callback result at this
  time, the Network-Request-Dialog may not be ready at the moment,
  causing the NPE to crash.

- Add NPE checks to avoid crash issues.

Bug: 220679437
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=NetworkRequestDialogActivityTest

Change-Id: I8e48a29649e72d9f8c67c4ac24f0eb27ba600dae
2022-03-22 18:14:22 +00:00
Eric Biggers
98ac6a6c01 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: I46e1ca934dff648e8730d445046fa3150913891b
2022-03-22 18:04:27 +00:00
Eric Biggers
b79a82260c Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieb1bf012ee0f735dcfc4d579eee9fc587bfbdbe1
2022-03-22 17:47:03 +00:00
Eric Biggers
465363a312 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieadee7a7c884500a836b5f118fce9b649e9e179b
2022-03-22 17:46:14 +00:00
Eric Biggers
d106ae0f82 Merge "Remove EXTRA_KEY_TYPE intent data" 2022-03-22 17:37:33 +00:00