Commit Graph

101128 Commits

Author SHA1 Message Date
Chen Xu
980b19b8f0 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: Ibb07c1ea83eb4b30883c859174dc4ffd7b143b3f
2022-03-22 06:32:21 +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
27dbc6ed2a Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: I10a5f94e302ef87490c2d4daa327a2207698de48
2022-03-22 05:50:29 +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
Bonian Chen
fd6a5e3fa4 Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)" into tm-dev am: bb44ceb407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286344

Change-Id: Ia862b4241f73dc0e4f8afb39d01277feb3db641d
2022-03-22 03:30:44 +00:00
Bonian Chen
7d6b56e866 Merge "[Settings] Avoid popup activity get bringup from recent history" into tm-dev am: 2a937b7f95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17259875

Change-Id: I7332e7af3053d1ee246c2e515e7206404665d930
2022-03-22 03:30:11 +00:00
Bonian Chen
bb44ceb407 Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)" into tm-dev 2022-03-22 03:12:17 +00:00
Bonian Chen
2a937b7f95 Merge "[Settings] Avoid popup activity get bringup from recent history" into tm-dev 2022-03-22 03:11:31 +00:00
William Escande
75151b017b 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: I677cf55920a854bfcab5fd330cce076acedb08ca
2022-03-21 20:42:19 +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
8139455374 Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623

Change-Id: I06b60f5208f839d42be064fd0ed9fbfc42c57a6e
2022-03-21 17:03:37 +00:00
William Escande
7c099faff6 Merge "API Review: factoryReset->clearBluetooth" 2022-03-21 16:56:32 +00:00
Chaohui Wang
a15f748f4e 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: I91d098c2264da4d64fadd05b3c9e6db2b5c303f1
2022-03-21 13:13:24 +00:00
Chaohui Wang
e7b38f27a3 Merge "Fix flicker for Device admin apps." into tm-dev 2022-03-21 12:49:45 +00:00
Bonian Chen
03d27a8f1b Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev am: 6b9a904500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286347

Change-Id: I0eee5b81671b29e6ced07b9d8b3c69e4bbe504b5
2022-03-21 09:34:55 +00:00
Bonian Chen
6b9a904500 Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev 2022-03-21 09:27:36 +00:00
Treehugger Robot
ab9220a13e Merge "Add i18n team to localepicker OWNER" am: 21eebdce59 am: 7ccb003e9a am: 2054adddf7 am: 31ae1b4623
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623

Change-Id: I53bb510a7a4f06a9567a7a8ef206aad5abb9afc8
2022-03-21 09:00:36 +00:00
Treehugger Robot
31ae1b4623 Merge "Add i18n team to localepicker OWNER" am: 21eebdce59 am: 7ccb003e9a am: 2054adddf7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623

Change-Id: Ib1b246c7c8adc01c9130ffe0c1d68172d43fe375
2022-03-21 08:41:20 +00:00
Treehugger Robot
2054adddf7 Merge "Add i18n team to localepicker OWNER" am: 21eebdce59 am: 7ccb003e9a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623

Change-Id: Icb64ffcf05c2fb20297a48f09ad09ecf7ca5468a
2022-03-21 08:29:16 +00:00
Tsung-Mao Fang
16a220c664 Merge "Clean up footer preference on battery saver page." into tm-dev am: 352c9dd86e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252810

Change-Id: I3ec920f9f7b3016e8f4044a99615af4e0e85bfda
2022-03-21 08:28:39 +00:00
Menghan Li
d03ea81c4b Merge "Migrate SuW new flag isMNStyle into Accessibility" into tm-dev am: 97a5a69070
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247847

Change-Id: I3ef7efdd97906c2f1448809224b91a3b1b15a3cb
2022-03-21 08:28:25 +00:00
Tsung-Mao Fang
352c9dd86e Merge "Clean up footer preference on battery saver page." into tm-dev 2022-03-21 08:20:02 +00:00
Treehugger Robot
7ccb003e9a Merge "Add i18n team to localepicker OWNER" am: 21eebdce59
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623

Change-Id: Ief9a16a4cae616181d206d81dc4698bdbbc34b8e
2022-03-21 08:10:31 +00:00
Bonian Chen
c79e74dd49 [Settings] Avoid popup activity get bringup from recent history
A popup dialog is designed to sit on top of an single instance activity.
Although activity might #finish(), but will be restarted due to staying
in the recent history.

Remove it from recent history may allow end user not seeing that UI.

Bug: 202033230
Test: local
Change-Id: Id1d52eefb90d011296495f39b1533a1af68435f1
(cherry picked from commit f81eaeb8fa)
2022-03-21 08:08:07 +00:00
Menghan Li
97a5a69070 Merge "Migrate SuW new flag isMNStyle into Accessibility" into tm-dev 2022-03-21 08:06:33 +00:00
Treehugger Robot
21eebdce59 Merge "Add i18n team to localepicker OWNER" 2022-03-21 07:56:11 +00:00
Treehugger Robot
82b009b161 [automerger skipped] Merge "Add LE audio hardware offload development option" am: 3c209b06c0 am: bcb4ee1e8c am: 3378f6e4da -s ours am: 4b6e468047 -s ours
am skip reason: Merged-In If1203c50d1d94ac9ed377293b5cb389b7b6f54a1 with SHA-1 7d56faf46a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I56094fe9492f913d1d5e5d0823885710598195b2
2022-03-21 07:10:41 +00:00
Treehugger Robot
4b6e468047 [automerger skipped] Merge "Add LE audio hardware offload development option" am: 3c209b06c0 am: bcb4ee1e8c am: 3378f6e4da -s ours
am skip reason: Merged-In If1203c50d1d94ac9ed377293b5cb389b7b6f54a1 with SHA-1 7d56faf46a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I3dc904637f7e742155a2694516c4f663b22ed41c
2022-03-21 06:52:28 +00:00
Treehugger Robot
3378f6e4da Merge "Add LE audio hardware offload development option" am: 3c209b06c0 am: bcb4ee1e8c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I4d509aab5b501b432bdd6789827945508c7468f0
2022-03-21 06:25:46 +00:00
Treehugger Robot
bcb4ee1e8c Merge "Add LE audio hardware offload development option" am: 3c209b06c0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I1e710f007fc0b0183b9cac41514aaadbf828bcaf
2022-03-21 05:52:37 +00:00
Calvin Pan
1fd5f8ff5c Add i18n team to localepicker OWNER
Change-Id: I5769d5040958b62d9f29f3a802bf06e10a40ea1d
2022-03-21 05:46:10 +00:00
Treehugger Robot
3c209b06c0 Merge "Add LE audio hardware offload development option" 2022-03-21 05:24:10 +00:00
TreeHugger Robot
53382d7d83 Merge "Fix connected device detail page slice items are in smaller font size" into tm-dev am: 27c2e0db82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233883

Change-Id: I680a031d47a6ebdb0a7422465a325089230b5b9b
2022-03-21 03:01:43 +00:00
TreeHugger Robot
27c2e0db82 Merge "Fix connected device detail page slice items are in smaller font size" into tm-dev 2022-03-21 02:54:54 +00:00
Jenhou (Alan) Huang
c33ffd6797 Merge "DO NOT MERGE Add setting page for the Spatial audio" into tm-dev am: e8ca43b239
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106472

Change-Id: I14ad0613a6221d55039aa6252e134730a88c8550
2022-03-21 02:07:01 +00:00
Alan Huang
ae6c25fdb4 DO NOT MERGE Add setting page for the Spatial audio am: 616b0925ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106472

Change-Id: Id499757a1f03ed692227bef4dc064664a2347b49
2022-03-21 02:06:58 +00:00
Jenhou (Alan) Huang
e8ca43b239 Merge "DO NOT MERGE Add setting page for the Spatial audio" into tm-dev 2022-03-21 01:59:31 +00:00
Bonian Chen
fa18f4de06 Revert "[Settings] Resolves unsynced infomation between status bar and settings"
This reverts commit 4f3ac2fcbd.

Reason for revert: Should be fixed by ag/15270340, and removing this one helps to avoid UI from shifting when user click on buttons within "Internet" settings UI (b/222805255).

Change-Id: I149f4beab329a6ba69434c6d923e1d6bc054b27d
2022-03-21 01:11:26 +00:00
Bonian Chen
b6a4bc9d3f [Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)
This is a change to enable the support of AdaptiveIcon for following
widgets:
1. Data Usage
2. Wi-Fi Hotspot
3. VPN

Bug: 225252321
Test: local
Change-Id: I523dee9cfd435a95fd31e8730053e0d9ff2c2339
(cherry picked from commit 86027479cb)
2022-03-21 00:18:26 +00:00
PETER LIANG
31486e8f24 Merge "Polish and humanize the strings for the preview of the conversation message." into tm-dev am: 24548b3a09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252803

Change-Id: I418f57a8365d08b2a84054dc6d41cd99205d5a1e
2022-03-20 22:43:01 +00:00
PETER LIANG
14c20b34e3 Merge "Polish and humanize the strings for the confirm dialog of "Display size and text"." into tm-dev am: 4269e13c19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247846

Change-Id: I1c20b786db24265f9dd4c2287bbceeea0e8828f6
2022-03-20 22:42:53 +00:00
PETER LIANG
24548b3a09 Merge "Polish and humanize the strings for the preview of the conversation message." into tm-dev 2022-03-20 22:35:03 +00:00
PETER LIANG
4269e13c19 Merge "Polish and humanize the strings for the confirm dialog of "Display size and text"." into tm-dev 2022-03-20 22:34:50 +00:00
Alan Huang
616b0925ac DO NOT MERGE Add setting page for the Spatial audio
The Spatial audio settings page control the state for the phone speaker
and the wired headphones

Test: make RunSettingsRoboTests

Bug: 220811398
Change-Id: I49e3fab48186d09357a8481652bdccb4aa5d044a
2022-03-20 15:55:53 +00:00
PETER LIANG
98091d6efd Merge "Fix that icons overlapped in Preview at Display size and text screen under Vision Settings." into tm-dev am: ca73aa40ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233888

Change-Id: I21e37c71393071a8d143bd26703c94db48825ae3
2022-03-20 05:29:18 +00:00
PETER LIANG
ca73aa40ef Merge "Fix that icons overlapped in Preview at Display size and text screen under Vision Settings." into tm-dev 2022-03-20 05:19:43 +00:00
Peter_Liang
d6b2b705ec Polish and humanize the strings for the preview of the conversation message.
New strings will replace the current strings of the conversation message.

Bug: 219163254
Test: manual test
Change-Id: I54d6563a04af2eb3e216d5b371d10a72c5d98c12
2022-03-20 12:09:50 +08:00
Peter_Liang
31f3dca871 Polish and humanize the strings for the confirm dialog of "Display size and text".
Extra action:
Add new strings.

Bug: 219163254
Test: manual test
Change-Id: Icaa8d4dd446872da665895b3343d8436717e22ed
2022-03-20 12:08:41 +08:00