Steven Ng
7f0cc14af8
Replace hard-coded bedtime action with Settings.ACTION_BEDTIME_SETTINGS
...
Test: atest SettingsRoboTests:com.android.settings.display.darkmode.*
Bug: 216645903
Change-Id: I3c3a00fa53528056538ab1ae34c011b4b44b3fdf
2022-02-01 16:56:17 +00:00
Joe Bolinger
fa68d9faa9
Merge "Fix crash when error is shown during invalid lifecycle."
2022-01-31 23:26:49 +00:00
Nate Myren
2f1fec89a0
Merge "Create PrivacyControls page in settings"
2022-01-31 22:43:04 +00:00
Jonathan Scott
c3dbc3ffbd
Merge "Allow Device Management Role Holder to update Settings strings."
2022-01-31 19:10:30 +00:00
Yuri Lin
17c47f1447
Merge "Cosmetic changes to zen mode people & sound/vibration screens"
2022-01-31 16:00:50 +00:00
Lucas Silva
7e324bb603
Merge "Implement dream complication settings."
2022-01-31 15:11:03 +00:00
Jack Yu
300e3ada63
[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 35b818e4f8
-s ours am: 401178c70f
-s ours
...
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Id1024aa29342ac3cc2fca07a263a5a0ed4f1e7e4
2022-01-28 23:48:18 +00:00
Jack Yu
178fd0d65c
[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 147f4bc01d
am: 29e46bd01e
-s ours
...
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Iee0c4d11b50cacf090a80efe07137582c517e19b
2022-01-28 23:48:10 +00:00
Jack Yu
401178c70f
[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 35b818e4f8
-s ours
...
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I4174c09fc219ee813fc74264c0e7dbc696eceda1
2022-01-28 23:31:15 +00:00
Jack Yu
29e46bd01e
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 147f4bc01d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ibb578e5efdfffa772c785cb482de853a19faf0b7
2022-01-28 23:29:42 +00:00
Jack Yu
147f4bc01d
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ib69851dd1d88fcba84af0cf940b6f949aab15355
2022-01-28 23:14:00 +00:00
Jack Yu
35b818e4f8
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I552305e84fd81e640b5dc3245826925b0318410d
2022-01-28 23:13:59 +00:00
Jack Yu
84cb11efc6
[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 7236467bb5
-s ours
...
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 d9e3e6e4b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Iaa871510caf6638c158f627ffba27bd0860b10b2
2022-01-28 23:03:09 +00:00
Jack Yu
05dfb08c80
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I72ccad504b36bd1112660cc180be93c210ae66c4
2022-01-28 22:53:00 +00:00
Joe Bolinger
ea69c42587
Fix crash when error is shown during invalid lifecycle.
...
Fix: 216492911
Test: manual
Change-Id: I1de23885a9b80fabdc199ad09c35c3f98e86c831
2022-01-28 22:52:29 +00:00
Jack Yu
7236467bb5
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I1babb5ca315f09d9602dd1b35ed2e2ccf032feb9
2022-01-28 22:48:44 +00:00
Jack Yu
b85416796d
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I9879ba034ae2b8d7a964a4d6c9d700bad55b636e
2022-01-28 22:31:38 +00:00
Jack Yu
1009054124
Do not let guest user disable secure nfc am: a579ca7554
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ic68c6849bb65875aea6286d415c66ae8a9f57dfa
2022-01-28 22:19:10 +00:00
TreeHugger Robot
54b127e2d8
Merge "[Settings] SIM colors are referenced by getIntArray() within source code" into sc-v2-dev am: a4a8d64edc
am: 71bf163671
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16634156
Change-Id: Iee90f048e0dd9618792d97747113594668cd04b9
2022-01-28 21:36:34 +00:00
TreeHugger Robot
71bf163671
Merge "[Settings] SIM colors are referenced by getIntArray() within source code" into sc-v2-dev am: a4a8d64edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16634156
Change-Id: I41bc13353be755ab1459511d6da515587df2eb24
2022-01-28 21:19:24 +00:00
TreeHugger Robot
a4a8d64edc
Merge "[Settings] SIM colors are referenced by getIntArray() within source code" into sc-v2-dev
2022-01-28 21:03:47 +00:00
Oli Lan
2ff9a71878
Merge "Allow the new avatar picker to open full screen on tablets."
2022-01-28 19:09:24 +00:00
Junyu Lai
2307724894
[automerger skipped] Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae
am: 21d08383c0
am: eb68eb5ec3
am: 4ff6cf0995
-s ours
...
am skip reason: Merged-In I8efecda5df403e9ed588daecd169cb3498d213a2 with SHA-1 25e26ea7af
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133
Change-Id: Ia56cec30613970f926ddf6ed8a4dc7a095bfb9e1
2022-01-28 17:42:09 +00:00
Lucas Silva
f0f7adc612
Implement dream complication settings.
...
This component allows the user to select dream complications to
enable/disable.
Bug: 215703483
Test: locally on device
Change-Id: I03dd9d67b4aeb3f41885b42391d97c18bd7465f6
2022-01-28 17:32:36 +00:00
Junyu Lai
4ff6cf0995
Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae
am: 21d08383c0
am: eb68eb5ec3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133
Change-Id: Ib436a34bf1f094013b8ceb5f8acc67091117e668
2022-01-28 17:27:56 +00:00
Junyu Lai
eb68eb5ec3
Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae
am: 21d08383c0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133
Change-Id: I68723f1f431a8c20c7502b71f2f4945c619ccf7d
2022-01-28 17:07:08 +00:00
Junyu Lai
21d08383c0
Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133
Change-Id: If8ffbe07e9bdd17a6fbcdb4dd143f613ada5d499
2022-01-28 16:48:54 +00:00
Junyu Lai
dac3f891ae
Merge "[MS49] Remove NetworkStats hidden Api usages"
2022-01-28 16:32:59 +00:00
Lucas Silva
5a7fc5d613
Merge "Dream settings refactor."
2022-01-28 15:51:18 +00:00
TreeHugger Robot
b22a383cf3
Merge "Apply a new icon cache mechanism for memory improvement"
2022-01-28 15:45:15 +00:00
Peter_Liang
1900be4361
New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (10/n).
...
1) Add a new text reading preference fragment for SetupWizard.
2) Add the entry into the vision settings, and temporarily set the visibility as gone.
Bug: 211503117
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreferenceFragmentForSetupWizardTest
Change-Id: I5582d79672a9a9a375a79dbdf3a2055e7d785269
2022-01-28 14:04:51 +00:00
Junyu Lai
e539db77c4
[MS49] Remove NetworkStats hidden Api usages
...
This includes:
1. Remove unused INetworkStatsService and NetworkStatsHistory.
2. Replace NetworkTemplate usages with builder.
3. Replace TrafficStats references to DataUnit.
4. Reimplement NetworkTemplate#normalize.
Test: make RunSettingsRoboTests
Bug: 204830222
(cherry-picked from ag/16724040)
Change-Id: I8efecda5df403e9ed588daecd169cb3498d213a2
Merged-In: I8efecda5df403e9ed588daecd169cb3498d213a2
2022-01-28 13:08:52 +00:00
Ricky Wai
d3fe360d26
Merge "Add restricted settings UI in Settings accessibility screeen"
2022-01-28 11:23:17 +00:00
Bill Yi
8f94676bc3
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
am: 58acafcc42
am: bcace9ec94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I89ac39395f2ce8553c25635ebaa45d94b1a301ce
2022-01-28 03:57:16 +00:00
Bill Yi
dfc506818f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours am: e5a95e2c27
-s ours am: 78137dae12
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Id6a03afc777955a66ce6cae181007f2971734a92
2022-01-28 03:57:14 +00:00
Bill Yi
c4da62b4f9
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
am: dc4bd7f721
am: ffcdc25bb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I112c8cf892227e9e1297362174dba0c29a56870c
2022-01-28 03:56:58 +00:00
Bill Yi
9a3ff1ac81
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours am: a85b3c079b
-s ours am: 47050372c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I8c03d6a2b9d6582aa9c27a67adc5fdc2f97d01ef
2022-01-28 03:56:47 +00:00
Bill Yi
bcace9ec94
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
am: 58acafcc42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I0b430e946575ae6665ccb14a308ce230137e24f1
2022-01-28 03:33:58 +00:00
Bill Yi
78137dae12
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours am: e5a95e2c27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: If5e4a68852084842fe5ca7539e4aacbfffc38945
2022-01-28 03:33:55 +00:00
Bill Yi
ffcdc25bb6
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
am: dc4bd7f721
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I54f091eb6314a2f3efed35e88e7f398087dca3b2
2022-01-28 03:33:19 +00:00
Bill Yi
47050372c7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours am: a85b3c079b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ib19651ad473c7c1e3ed2bdb56eabf771a3617bd9
2022-01-28 03:33:15 +00:00
Bill Yi
58acafcc42
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Iec5a5e1458504100e8189ad99b6b459823b7e6e6
2022-01-28 03:13:54 +00:00
Bill Yi
dc4bd7f721
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ie9fb258fd1c063363b545a0bb5db659f3f207bb4
2022-01-28 03:13:54 +00:00
Bill Yi
e5a95e2c27
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I8604a89393903f3f994f7be7cfae7b6e7f6d3900
2022-01-28 03:13:53 +00:00
Bill Yi
a85b3c079b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ia0e06bf03996897f9619d2e62b899ffd5878b4b5
2022-01-28 03:13:52 +00:00
Bill Yi
61efb14d7f
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-mainline-prod am: d326cb4ae3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I7417fb27cef002c7f9d24978a43c8d766e8006fe
2022-01-28 03:12:58 +00:00
Bill Yi
1d0243cc5c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-28 02:54:56 +00:00
Bill Yi
7793bd6b17
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00
Bill Yi
d326cb4ae3
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00
Bill Yi
f28b7ace82
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
2p: c09b5ba58d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00