TreeHugger Robot
0cad38f06f
Merge "[Panlingual][patch] Handle onLocaleSelected."
2022-03-23 18:16:07 +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
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
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
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
78b2b241a9
Merge "Add a developer option to controll mockmodemservice permission"
2022-03-23 05:46:22 +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
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
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
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
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
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
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
d106ae0f82
Merge "Remove EXTRA_KEY_TYPE intent data"
2022-03-22 17:37:33 +00:00
Kweku Adams
10ef599170
Make reward constants configurable.
...
Make it possible to configure the instant and max values of all
supported actions. Ongoing rewards will be enabled later.
Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: Ia854f18820f3fe95b3b1448c5fa8411853859052
2022-03-22 17:37:07 +00:00
TreeHugger Robot
af18f6353c
Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747
Change-Id: I4f24c0f10032ef9d661e1ba1d555099f6bfe7e8d
2022-03-22 14:43:36 +00:00
TreeHugger Robot
285cfcda41
Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev
2022-03-22 14:42:43 +00:00
Yuri Ufimtsev
d4165ec9e1
Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603
Change-Id: Ied8cb07c3ddd89a28e167c6eb18eaea534c6a250
2022-03-22 13:55:41 +00:00
Yuri Ufimtsev
b1469cce58
Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743
Change-Id: Ic2fe73e794f3f41708308762757270024e696a93
2022-03-22 13:55:33 +00:00
Yuri Ufimtsev
b39ab3e1c4
Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev
2022-03-22 13:41:33 +00:00
danielwbhuang
817e168e37
[Panlingual][patch] Handle onLocaleSelected.
...
1. reference: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/17157185/13/core/java/com/android/internal/app/LocaleStore.java#204
2. check isSystemLocale()
Bug: 223090738
Test: local test pass
Change-Id: I42fbd06495880698201831d947d28515fb674a5a
2022-03-22 18:42:13 +08:00
Yuri Ufimtsev
be98245015
Declare task affinity for entries that could be launched by SafetyCenter
...
Test: manual
Bug: 222676668
Change-Id: I44c2f0cee61ffd8f10284cda5a740a9e9d9ea7bb
2022-03-22 10:36:28 +00:00
Minche Li
1fb55c056a
Merge "Hides the settings entry in Magnification Settings if window magnification feature is not supported" into tm-dev am: 41257fe00a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286343
Change-Id: Id3aeecb00020ce42c14ce954279a79d270f25cd1
2022-03-22 09:44:45 +00:00
Yuri Ufimtsev
b2358c6cce
Register Safety Center as SubSetting for two-pane mode
...
Test: manual
Bug: 225166059
Change-Id: I3e6e877154a2ec831ce5f72f0aa8ec67023f09dd
2022-03-22 08:54:16 +00:00
Minche Li
41257fe00a
Merge "Hides the settings entry in Magnification Settings if window magnification feature is not supported" into tm-dev
2022-03-22 08:54:12 +00:00
Wesley Wang
5367c602d2
Merge "Update battery saver schedule min trigger value" into tm-dev am: 878dae3db0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252813
Change-Id: I159db97f0953c9569592ea123c64e89baac87e1a
2022-03-22 07:05:37 +00:00
Wesley Wang
878dae3db0
Merge "Update battery saver schedule min trigger value" into tm-dev
2022-03-22 06:51:52 +00:00
Chen Xu
178869aad3
Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084 am: 27dbc6ed2a am: 1b29155aa3 am: 3ec2593137
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870
Change-Id: I81dff07999b1b4ce159aa8ea0de6d94d2b80a920
2022-03-22 06:32:08 +00:00
Chen Xu
3ec2593137
Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084 am: 27dbc6ed2a am: 1b29155aa3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870
Change-Id: Iee87b5751d6216e29f64bca1bd91c70cd14d8875
2022-03-22 06:17:13 +00:00
Chen Xu
1b29155aa3
Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084 am: 27dbc6ed2a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870
Change-Id: Ia5c57252e2c6eba348b5ad89e63c49cd03e8e9d3
2022-03-22 06:05:20 +00:00
Chen Xu
dbe7baa084
Merge "Do not allow editing of mcc, mnc for carrier id APNs"
2022-03-22 05:34:21 +00:00
Gary Jian
5a535e6674
Add a developer option to controll mockmodemservice permission
...
Bug: 220995034
Test: 1.enable/disable from developer option and check the property value
2.atest MockModemPreferenceControllerTest
Change-Id: Iaa1a29f4214e1208fe4de497ff4b05c47c34b266
2022-03-22 12:02:52 +08:00
Yi-Ling Chuang
a28770e459
Add visibility control for the UiBlocker
...
The existing UiBlocker mechanism doesn't support additional visibility
control. With that, controllers that want to control their own
visibility won't be able to use UiBlocker.
Fixes: 223340393
Test: robotest
Change-Id: I2df2eb1ce77e2c94bb271a8b68cc8c6004df5c70
2022-03-22 11:53:33 +08:00
Lais Andrade
b827221ed3
Make sure vibration previews in Settings apply latest intensities
...
Update the Settings app to enforce fresh settings are applied to preview
vibrations triggered after the intensity is updated.
Add preview haptics to main switch, only when touch feedback is enabled,
and to the "apply ramping ringer" toggle for consistency with the rest
of the screen, using ringtone intensity for preview.
Bug: 219693646
Bug: 219695212
Bug: 157533521
Test: manual
Change-Id: I872a75d6b00dffae943b0f403185a39047909884
2022-03-21 18:33:44 +00:00
William Escande
531c4516f5
Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6 am: 8139455374 am: 18f403141b am: 372d74ba71
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623
Change-Id: I41aa12aecf6209ac9e01ddf923a9c47e4caa9da7
2022-03-21 18:02:11 +00:00
William Escande
372d74ba71
Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6 am: 8139455374 am: 18f403141b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623
Change-Id: Idbb4df614a56b632a7883e51aae0d21b762c643f
2022-03-21 17:44:57 +00:00
William Escande
18f403141b
Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6 am: 8139455374
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623
Change-Id: Ia6a29c6c299aff76a4e1fc2ef58880e2ef76969c
2022-03-21 17:20:58 +00:00
William Escande
7c099faff6
Merge "API Review: factoryReset->clearBluetooth"
2022-03-21 16:56:32 +00:00
mincheli
57b35f9f35
Hides the settings entry in Magnification Settings if window magnification feature is not supported
...
If the device doesn't support window magnification featue, we
should hide the settings entry in mangification settings
Bug: 213414385
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I73f087da54cd2930c049dabb6b843c3b373e3c20
2022-03-21 22:48:34 +08:00
Chaohui Wang
ae07bd78d0
Merge "Fix flicker for Device admin apps." into tm-dev am: e7b38f27a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252814
Change-Id: I64262a2b9e224a0f3a3b939ec15ab336eca57605
2022-03-21 13:12:59 +00:00