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
Chaohui Wang
e7b38f27a3
Merge "Fix flicker for Device admin apps." into tm-dev
2022-03-21 12:49:45 +00:00
Bonian Chen
c383a15d1b
Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev am: 6b9a904500
am: 03d27a8f1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286347
Change-Id: I2d57128512ecfa6a38ac74c2d176bcd85ace42e2
2022-03-21 09:51:01 +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
ed98a76f2d
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: I4084b5ac506dd82e9e222668f28e8e7e343cda8d
2022-03-21 09:34:31 +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
cdccedb20d
Merge "Add i18n team to localepicker OWNER" am: 21eebdce59
am: 7ccb003e9a
am: 2054adddf7
am: 31ae1b4623
am: ab9220a13e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623
Change-Id: Ib336d4ca12d73b8ec784c79f1ee47c1ba77ac33a
2022-03-21 09:16:51 +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
e7b6e48b89
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: I3ee8af37931bdf8e42df150bac5bec8bc6be7c23
2022-03-21 08:58:56 +00:00
Tsung-Mao Fang
d09bb273cc
Merge "Clean up footer preference on battery saver page." into tm-dev am: 352c9dd86e
am: 16a220c664
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252810
Change-Id: Iffac9a72f2c2b2515097f45044cd1fd87036a338
2022-03-21 08:43:57 +00:00
Menghan Li
8dd90b7596
Merge "Migrate SuW new flag isMNStyle into Accessibility" into tm-dev am: 97a5a69070
am: d03ea81c4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247847
Change-Id: Id226effb957606e09140cc0c6da1fb98276a721c
2022-03-21 08:43:48 +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
55331ac071
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: I9df721afa0b4d94f4fa192b7c03597abe2daa0e5
2022-03-21 08:26:15 +00:00
Menghan Li
ac4047db6d
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: Ic1c84d802445e598d4fda5742ce710de4ad26aec
2022-03-21 08:25:57 +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
Wesley Wang
b26d99ac77
Update battery saver schedule min trigger value
...
- Udpate the min value to 10%, also change related preference summary
and seekbar value
- Make battery saver main page's switch support first time trigger
warning
Bug: 207470943
Test: make RunSettingsRoboTests
Change-Id: I120b9a6784ed90eacccb09bb11f079f12679e95c
2022-03-21 16:13:34 +08: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
Bonian Chen
3370b50c6b
Merge "[Settings] Avoid popup activity get bringup from recent history"
2022-03-21 08:06:17 +00:00
Treehugger Robot
21eebdce59
Merge "Add i18n team to localepicker OWNER"
2022-03-21 07:56:11 +00:00
Treehugger Robot
47d5bcf609
[automerger skipped] Merge "Add LE audio hardware offload development option" am: 3c209b06c0
am: bcb4ee1e8c
am: 3378f6e4da
-s ours am: 4b6e468047
-s ours am: 82b009b161
-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: Ie52289bec0c7deb55b8de5bf0dca0626fdf30002
2022-03-21 07:26:37 +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
c435cbf551
[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: Id5ed5d50b3cb5c6c6f068eab4291df5edc5d061b
2022-03-21 07:08:32 +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
Eric Biggers
1cc85062cf
Remove EXTRA_KEY_TYPE intent data
...
This intent data was only used by CryptKeeperSettings, which has been
removed. This is also one of the only remaining users of the
StorageManager.CRYPT_TYPE_* constants which were only ever intended to
be used with vold's Full Disk Encryption APIs, which have been removed.
Bug: 208476087
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
(No regressions seen; 2 tests fail both before and after.)
Change-Id: Id6e2c0f5ecc79f7372b29393e66ffbd66d52d7a2
2022-03-21 05:09:48 +00:00
TreeHugger Robot
a001534b6d
Merge "Fix connected device detail page slice items are in smaller font size" into tm-dev am: 27c2e0db82
am: 53382d7d83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233883
Change-Id: I2c87f7b87ddff7f399f6b3182cb599d818a0a1aa
2022-03-21 03:13:24 +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
d4d3413385
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: I72498de9e9b4f93f1dc7c10bdd1754a1f6222cc0
2022-03-21 03:01:22 +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
1542d7f246
[automerger skipped] Merge "DO NOT MERGE Add setting page for the Spatial audio" into tm-dev am: e8ca43b239
am: c33ffd6797
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106472
Change-Id: I4c98595928f0db3d829e89d9e84f5426d80dcf38
2022-03-21 02:16:50 +00:00
Alan Huang
857894d817
[automerger skipped] DO NOT MERGE Add setting page for the Spatial audio am: 616b0925ac
am: ae6c25fdb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106472
Change-Id: I35702f2d057de85309dd85f5facd965a0b55cf29
2022-03-21 02:16:46 +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
3266668dcc
[automerger skipped] Merge "DO NOT MERGE Add setting page for the Spatial audio" into tm-dev am: e8ca43b239
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106472
Change-Id: I69de85ffb36d80fa6a0fd6acc3b83770c9438704
2022-03-21 02:06:30 +00:00
Alan Huang
bbbd4d8264
[automerger skipped] DO NOT MERGE Add setting page for the Spatial audio am: 616b0925ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106472
Change-Id: I0f49b833c97a22f25e1f54d4e4da5b101886b7d3
2022-03-21 02:06:26 +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
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