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
Bonian Chen
77366eb315
Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)"
2022-03-21 00:18:06 +00:00
Bonian Chen
8837fa3d3b
Merge "[Settings] Code refactor - NetworkModePreference"
2022-03-21 00:16:02 +00:00
PETER LIANG
2075c75b7b
Merge "Polish and humanize the strings for the preview of the conversation message." into tm-dev am: 24548b3a09
am: 31486e8f24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252803
Change-Id: I6e6a9cc53a02f0093675e8b6158ce6c26f58fb17
2022-03-20 22:53:07 +00:00
PETER LIANG
edc9aa06db
Merge "Polish and humanize the strings for the confirm dialog of "Display size and text"." into tm-dev am: 4269e13c19
am: 14c20b34e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247846
Change-Id: Iafcc8dc01352d33c44e39f9b63d7b488b2d97987
2022-03-20 22:53:00 +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
d057fbb8d3
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: I84ab5eed871998fab95a9531f638ed805f64d387
2022-03-20 22:42:39 +00:00
PETER LIANG
cef67abf45
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: Id3c74876d5b99e8322bc1391a05ef3aeb85958c1
2022-03-20 22:42:29 +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
ce3192a887
Merge "Fix that icons overlapped in Preview at Display size and text screen under Vision Settings." into tm-dev am: ca73aa40ef
am: 98091d6efd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233888
Change-Id: Icad0dc8e98c90ebbf731d024777481cc43769e9a
2022-03-20 05:41:25 +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
42ddce357d
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: I24ac26b3b14f6172b1afb82c5d5d66c580895fb3
2022-03-20 05:29:01 +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
PETER LIANG
4298995e96
Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 763f9c5a98
am: a1caf7fc8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247844
Change-Id: I984ebeaca3e7a54fada5b9843c17504bb4cc9813
2022-03-19 14:46:03 +00:00
PETER LIANG
a1caf7fc8f
Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 763f9c5a98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247844
Change-Id: I2c492f3668da2f900d0d27563b0decc94209de2c
2022-03-19 14:36:35 +00:00
PETER LIANG
1920f07380
Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 763f9c5a98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247844
Change-Id: Ie66f0906238f9fe5a37f0f884dc2ec25f55906c5
2022-03-19 14:36:21 +00:00
PETER LIANG
763f9c5a98
Merge "Polish and humanize the strings for the preview of mail content." into tm-dev
2022-03-19 14:32:04 +00:00
Jason Hsu
4d7b9dcaf8
Merge "Update content in Accessibility -> Hearing aids" into tm-dev am: eb4cc843ae
am: 8a683e72ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252806
Change-Id: I4273a3fecd2fbe06725df2d5aaf754e1ce2f231c
2022-03-19 14:19:30 +00:00
Jason Hsu
f00d1d6e5b
Merge "Add strings for pair other ear dialog." into tm-dev am: 5f3bf16471
am: bf510f1a44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252805
Change-Id: I96c0e9237de50ac9c53ccca28704582d12071813
2022-03-19 14:19:22 +00:00
Jason Hsu
8a683e72ad
Merge "Update content in Accessibility -> Hearing aids" into tm-dev am: eb4cc843ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252806
Change-Id: I872fc750b0e6037454fbaaffbc811d205aa0affa
2022-03-19 14:11:52 +00:00
Jason Hsu
bf510f1a44
Merge "Add strings for pair other ear dialog." into tm-dev am: 5f3bf16471
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252805
Change-Id: I084f840b4b61a22210a7aa338409cdb962f99c95
2022-03-19 14:11:45 +00:00
Jason Hsu
85795aac19
Merge "Update content in Accessibility -> Hearing aids" into tm-dev am: eb4cc843ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252806
Change-Id: I835201e9abd7146bb819a5c0e2808fcd18c77f96
2022-03-19 14:11:42 +00:00
Jason Hsu
5c8b1c8751
Merge "Add strings for pair other ear dialog." into tm-dev am: 5f3bf16471
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252805
Change-Id: I376502728d348e030a4c91918c3511b1b19ed706
2022-03-19 14:11:31 +00:00
Jason Hsu
eb4cc843ae
Merge "Update content in Accessibility -> Hearing aids" into tm-dev
2022-03-19 14:02:31 +00:00
Jason Hsu
5f3bf16471
Merge "Add strings for pair other ear dialog." into tm-dev
2022-03-19 14:01:13 +00:00
jasonwshsu
702f242e47
Update content in Accessibility -> Hearing aids
...
* Update pair instruction dialog
* Update summary of hearing aids preference
* Add a title of the preference screen
Bug: 225117843
Test: build pass
Change-Id: Ia74b75a813a465d2ef6817d5a46d962f61a77a7c
2022-03-19 21:51:38 +08:00
jasonwshsu
438db974c4
Add strings for pair other ear dialog.
...
Dialog shows when only one of the hearing aid device set is connected.
Bug: 225117454
Test: build pass
Change-Id: If7a98c022749f62bf6905ef6ee153037333dd725
2022-03-19 21:51:38 +08:00
Kholoud Mohamed
74041fbbde
[automerger skipped] Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev am: 51043a1513
am: af10f3f270
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607
Change-Id: If7dadbe1f582b6d6b65197f89a5250d4ddb03ce9
2022-03-19 06:44:10 +00:00
kholoud mohamed
13d27e7a75
[automerger skipped] RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class am: de78149c16
am: 9693ec41ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607
Change-Id: I6db6fae06859cba7b23bf2069bdd1f41de03c9bd
2022-03-19 06:44:01 +00:00
Kholoud Mohamed
af10f3f270
Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev am: 51043a1513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607
Change-Id: If4d83b29d33b390cbc08e34217f741754eea812e
2022-03-19 06:37:09 +00:00
kholoud mohamed
9693ec41ed
RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class am: de78149c16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607
Change-Id: Icd8f69faf43667745b9c467c23db213a9e928530
2022-03-19 06:36:59 +00:00
Kholoud Mohamed
629ce0a92b
[automerger skipped] Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev am: 51043a1513
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607
Change-Id: Id5d89009f239ad553b8d796699d547a6672e1b86
2022-03-19 06:36:57 +00:00
kholoud mohamed
387727d298
[automerger skipped] RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class am: de78149c16
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607
Change-Id: Id8169536c29891ba5d19ed30396f43b74fead91e
2022-03-19 06:36:46 +00:00
Kholoud Mohamed
51043a1513
Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev
2022-03-19 06:30:10 +00:00
Bill Yi
b2d45ce204
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-03-19 03:02:47 +00:00
TreeHugger Robot
7bd04e3469
Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d
am: 4f45c5cb60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529
Change-Id: I6c6ddaf44c125dd6c132bf2d7d41b59e27dca5a1
2022-03-19 02:54:44 +00:00
Bonian Chen
93ca7288cf
[Settings] Code refactor - NetworkModePreference
...
Code refactor for improving readibility.
Bug: 223461708
Test: unit test EnabledNetworkModePreferenceControllerTest
Change-Id: I3b3157cbc76f104d63062fda495a7391ecc18ada
2022-03-19 10:46:06 +08:00
TreeHugger Robot
4f45c5cb60
Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529
Change-Id: I83478f5d399adaa63d41e868d23b1fab8e43e97d
2022-03-19 02:39:23 +00:00
TreeHugger Robot
beb1fdc345
Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529
Change-Id: Ie27bb45432f30b16e2045b87c89901eeda327b2a
2022-03-19 02:39:13 +00:00
TreeHugger Robot
70e2ed1b9d
Merge "Hide emergency setting from "Search settings"" into tm-dev
2022-03-19 02:22:59 +00:00
Treehugger Robot
ef23f9ba15
Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862
am: 0b28adfd8e
am: bbb9db4149
am: 4463829319
am: 76c6ece6e5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626
Change-Id: Ieef65d41ccf6812ab1bd50b1dfa44b08b0cee5a3
2022-03-19 00:49:44 +00:00
Kweku Adams
a9b20aab5b
Merge "Make action constants configurable." into tm-dev am: 696010b0c5
am: 55cdc01a76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260256
Change-Id: Ibe16375f0627a6f851b7dd4ffc207c1842be0420
2022-03-19 00:48:36 +00:00
Giulio Fiscella
0543f2f0e0
[automerger skipped] Merge "Use new severity levels and builders" into tm-dev am: d5d6846846
-s ours am: 761fab2027
-s ours
...
am skip reason: Merged-In I9fa4b22e0ca1ca63e75eab427a7beedd95b744da with SHA-1 3612e9e440
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106963
Change-Id: I28706a4dc1e809b1d951ffa8da8689a1789180e2
2022-03-19 00:43:44 +00:00