Marie Matheson
4bc48cd068
Use primary profile lock settings string in Safety Source, not work profile am: d4822fe6b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16979281
Change-Id: I38e920f39285fe9b55c70ccf84e468af7631fbeb
2022-02-23 20:42:48 +00:00
Marie Matheson
49213e5f87
Merge "Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper" into tm-dev am: 67c0b83f7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941462
Change-Id: Iceba51934c39418a12522b6702629c7bb47602bf
2022-02-23 20:10:33 +00:00
TreeHugger Robot
ce3411dfe4
[automerger skipped] Merge "Cache mechanism for Storage page" into tm-dev am: d3cb79a127 -s ours
...
am skip reason: Merged-In I75533742a025dc61116207285a894ee728d0af68 with SHA-1 c23be3fa16 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986444
Change-Id: I39c9df2c579c16d533e7ffd8ddd9eae702d88800
2022-02-23 19:57:26 +00:00
TreeHugger Robot
be29553d9b
Merge "Fix incorrect colored bar when task bar is hidden" into tm-dev am: 4003526dd5 am: 71ea2ec3b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972170
Change-Id: I06281df7049aa94459ad89510d98a88f531b2cc2
2022-02-23 19:45:27 +00:00
TreeHugger Robot
8fff1299b4
Merge "Fix incorrect colored bar when task bar is hidden" into tm-dev am: 4003526dd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972170
Change-Id: Ib9ad1b50cd59449ff8c2ff2979660fbc9b7eeaaf
2022-02-23 19:33:26 +00:00
Christian Göllner
082e661bc3
Merge "Add support for device state based auto-rotation preferences in Settings." into tm-dev am: 1a160636b5 am: 91486e2823
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16967923
Change-Id: I9052801fc8683c2f1f0d87c8854d742e61c729cb
2022-02-23 18:57:35 +00:00
Christian Göllner
918ff26ece
Merge "Add support for device state based auto-rotation preferences in Settings." into tm-dev am: 1a160636b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16967923
Change-Id: Ic82fbebfa269be55037553ae911198794f9dd81a
2022-02-23 18:55:33 +00:00
TreeHugger Robot
71ea2ec3b1
Merge "Fix incorrect colored bar when task bar is hidden" into tm-dev am: 4003526dd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972170
Change-Id: I23fa2457814f9791efaa82901dde9012f99fce58
2022-02-23 17:19:01 +00:00
Christian Göllner
91486e2823
Merge "Add support for device state based auto-rotation preferences in Settings." into tm-dev am: 1a160636b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16967923
Change-Id: I51b72ed64c9b6023a096ac040261b09951c77375
2022-02-23 16:58:36 +00:00
Marie Matheson
d658babff5
Merge changes from topic "b220384387" into tm-mainline-prod am: d4553dd10b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941462
Change-Id: Iceda72893072b07ea30e9cf5f49c32830344198d
2022-02-23 16:53:12 +00:00
TreeHugger Robot
5fb20b8ecb
[automerger skipped] Merge changes from topic "presubmit-am-29aa077ecb4346d8884ed19e21dc3b3c" into tm-mainline-prod am: e1be038ca8 -s ours
...
am skip reason: Merged-In I75533742a025dc61116207285a894ee728d0af68 with SHA-1 c23be3fa16 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986444
Change-Id: Ia478e0111ce6e76e8b82f34af0848dda908eadc6
2022-02-23 16:32:30 +00:00
Marie Matheson
d4822fe6b4
Use primary profile lock settings string in Safety Source, not work profile
...
Test: atest CtsSafetyCenterTestCases
Bug: 215518847
Change-Id: I1c7ddbeb05be81fa902fcb4e42868ddd770d2dc0
2022-02-23 13:42:03 +00:00
Marie Matheson
67c0b83f7f
Merge "Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper" into tm-dev
2022-02-23 13:34:15 +00:00
Marie Matheson
d4553dd10b
Merge changes from topic "b220384387" into tm-mainline-prod
...
* changes:
[automerge] Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper 2p: ce321f0dd0
Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper
2022-02-23 13:34:15 +00:00
Marie Matheson
7cee858c1e
Merge changes from topic "b220384387"
...
* changes:
[automerge] Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper 2p: ce321f0dd0 2p: 4efab754ce
[automerge] Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper 2p: ce321f0dd0
Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper
2022-02-23 13:34:15 +00:00
TreeHugger Robot
d3cb79a127
Merge "Cache mechanism for Storage page" into tm-dev
2022-02-23 12:13:38 +00:00
TreeHugger Robot
e1be038ca8
Merge changes from topic "presubmit-am-29aa077ecb4346d8884ed19e21dc3b3c" into tm-mainline-prod
...
* changes:
[automerge] Cache mechanism for Storage page 2p: c23be3fa16
Cache mechanism for Storage page
2022-02-23 12:13:38 +00:00
TreeHugger Robot
9ab59214c6
Merge changes from topic "presubmit-am-29aa077ecb4346d8884ed19e21dc3b3c"
...
* changes:
[automerged blank] Cache mechanism for Storage page 2p: c23be3fa16 2p: 068fe1c035
[automerge] Cache mechanism for Storage page 2p: c23be3fa16
Cache mechanism for Storage page
2022-02-23 12:13:38 +00:00
TreeHugger Robot
08f689feeb
Merge "[Panlingual] Improve UI can not show on at first."
2022-02-23 11:05:38 +00:00
TreeHugger Robot
4003526dd5
Merge "Fix incorrect colored bar when task bar is hidden" into tm-dev
2022-02-23 10:43:03 +00:00
Presubmit Automerger Backend
cf27889718
[automerge] Fix incorrect colored bar when task bar is hidden 2p: 39c8905f4c 2p: c4594d9948
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972170
Change-Id: I50854b6409bfad67fba529f2dad7190979ebe4cd
2022-02-23 10:41:29 +00:00
Christian Göllner
1a160636b5
Merge "Add support for device state based auto-rotation preferences in Settings." into tm-dev
2022-02-23 10:41:24 +00:00
Presubmit Automerger Backend
c4594d9948
[automerge] Fix incorrect colored bar when task bar is hidden 2p: 39c8905f4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972170
Change-Id: Iec184e49d8bcb3ccef49a13f0bb24d048103c759
2022-02-23 10:41:24 +00:00
Tsung-Mao Fang
39c8905f4c
Fix incorrect colored bar when task bar is hidden
...
Set backgorund color on content id view instead of homepage view.
Also setup edge to edge for the homepage.
Fix: 215440529
Test: See correct ui on the two pane mode and regular phone.
Change-Id: I2d5988a489410e9620137bd6cf9607768787d4fc
2022-02-23 10:41:14 +00:00
tom hsu
cae20ce2f7
[Panlingual] Improve UI can not show on at first.
...
- Settings take much time to get the info of app launcher entry. User
may not see the panlingual UI at first after boot to home.
- Does small refactor to somewhere.
Bug: 218416193
Test: local
Test: atest pass
Change-Id: Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591
2022-02-23 16:33:21 +08:00
Mill Chen
f71c407cd6
[automerged blank] Cache mechanism for Storage page 2p: c23be3fa16 2p: 068fe1c035
...
Blank merge reason: Change-Id I75533742a025dc61116207285a894ee728d0af68 with SHA-1 77775a66f2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986444
Bug: 191117970
Change-Id: Ic7cd78287a138ef3d33041c0408eb3f3129286d5
Merged-In: I75533742a025dc61116207285a894ee728d0af68
2022-02-23 08:16:09 +00:00
Mill Chen
068fe1c035
[automerge] Cache mechanism for Storage page 2p: c23be3fa16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986444
Bug: 191117970
Change-Id: I3c09e755c1dd3a218be047fb25a751a3931caf42
Merged-In: I75533742a025dc61116207285a894ee728d0af68
2022-02-23 08:16:01 +00:00
Mill Chen
c23be3fa16
Cache mechanism for Storage page
...
- Use SharedPreference to cache the size info
- Improve the flicker problem on Documents & other preference
- The jobs are destroied on onPause to prevent the jobs being
restarting when back to Storage page
- Enable progress bar animation for each storage item
Bug: 191117970
Test: manual test
1) The loading spinner will be shown when entering Storage page
at first time.
2) Back to Settings homepage and switch back to Storage page, the
loading spinner shouldn't be shown.
3) Click each preference in the Storage page and switch between these
pages, the size info should be updated if something removed and the
order of preference shouldn't be changed.
Change-Id: I75533742a025dc61116207285a894ee728d0af68
Merged-In: I75533742a025dc61116207285a894ee728d0af68
(cherry picked from commit 77775a66f2 )
2022-02-23 08:15:14 +00:00
Kweku Adams
3ad1c4a9c8
Simplifying settings string generation. am: 82b0e1ccdb am: e6f24f02fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980814
Change-Id: I80e5e86952ce74d234cd3f366fbfc4bd7498b1d3
2022-02-22 21:57:26 +00:00
Kweku Adams
e6f24f02fd
Simplifying settings string generation. am: 82b0e1ccdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980814
Change-Id: Ic1b46b0e0cc05f6cfbed6e2d672ea4daafa89ad8
2022-02-22 21:14:27 +00:00
Kweku Adams
82b0e1ccdb
Simplifying settings string generation.
...
Remove duplicate code for generating the settings constant strings, and
make sure not to write redundant data (setting a value to its default).
Bug: 158300259
Test: Android builds
Change-Id: Id79bae3685bfecb4858574ee38b67b2a554823fe
2022-02-22 18:52:35 +00:00
Presubmit Automerger Backend
097d3e242c
[automerge] Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper 2p: ce321f0dd0 2p: 4efab754ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941462
Bug: 220384387
Change-Id: I6d4b9c4cbc151519ad6630e34b13b0b3aeb87367
2022-02-22 16:37:31 +00:00
Presubmit Automerger Backend
4efab754ce
[automerge] Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper 2p: ce321f0dd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941462
Bug: 220384387
Change-Id: I2bb6eee411ddf17fdca8e0b6fc80050a080c1e14
2022-02-22 16:37:22 +00:00
Marie Matheson
ce321f0dd0
Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper
...
Test: SettingsUnitTests
Bug: 220384387
Change-Id: I3886d3cf4717b5c7efd99ebd8ffb6a039e3565a4
2022-02-22 16:36:17 +00:00
Yuri Ufimtsev
2aeaefbaba
Merge "Provide data to LockScreenSafetySource" into tm-dev am: 6368af8bdf am: 6a31bfe04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921
Change-Id: Ibedc09cf02b0d24deae4efebaf0b951e1679d04b
2022-02-22 15:27:56 +00:00
Yuri Ufimtsev
175e48cb19
Merge "Move all the shared data from biometric controllers to separate utility classes" into tm-dev am: 9bc5f2ee0d am: 3104be2f95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Change-Id: I0adf8b48c962eb316548a2c76c943163fe37029b
2022-02-22 15:17:15 +00:00
Yuri Ufimtsev
877964852a
Merge changes from topic "presubmit-am-4b2506520ad5436ca10c9e64940a6c76" into tm-mainline-prod am: 11a32117f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921
Change-Id: I68180cf76225ee872872f1dac5817e87d961ab4b
2022-02-22 15:03:28 +00:00
Yuri Ufimtsev
4a314e82b1
Merge "Move all the shared data from biometric controllers to separate utility classes" into tm-dev am: 9bc5f2ee0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Change-Id: I13d8d14302ee401ded26a89a87ef074b06d59bb8
2022-02-22 14:53:00 +00:00
Yuri Ufimtsev
6a31bfe04b
Merge "Provide data to LockScreenSafetySource" into tm-dev am: 6368af8bdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921
Change-Id: I979e08ada4c8ddd6ddc3bd929d37fa95e7a27ab8
2022-02-22 14:41:25 +00:00
Yuri Ufimtsev
3104be2f95
Merge "Move all the shared data from biometric controllers to separate utility classes" into tm-dev am: 9bc5f2ee0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Change-Id: Ifaeb66fa2089e6c84d2a32381301a11d71956988
2022-02-22 14:41:00 +00:00
Yuri Ufimtsev
6368af8bdf
Merge "Provide data to LockScreenSafetySource" into tm-dev
2022-02-22 14:21:40 +00:00
Yuri Ufimtsev
11a32117f2
Merge changes from topic "presubmit-am-4b2506520ad5436ca10c9e64940a6c76" into tm-mainline-prod
...
* changes:
[automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865
Provide data to LockScreenSafetySource
2022-02-22 14:21:40 +00:00
Yuri Ufimtsev
8e1113b735
Merge changes from topic "presubmit-am-4b2506520ad5436ca10c9e64940a6c76"
...
* changes:
[automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865 2p: 2ff02b865a
[automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865
2022-02-22 14:21:40 +00:00
Yuri Ufimtsev
cb3ae2da69
Merge changes from topic "presubmit-am-4b2506520ad5436ca10c9e64940a6c76"
...
* changes:
[automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865
Provide data to LockScreenSafetySource
2022-02-22 14:21:40 +00:00
Yuri Ufimtsev
9bc5f2ee0d
Merge "Move all the shared data from biometric controllers to separate utility classes" into tm-dev
2022-02-22 14:20:51 +00:00
Yuri Ufimtsev
c7532d90cc
Merge changes from topic "215517420-tm-dev"
...
* changes:
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6 2p: b777246dca
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6
2022-02-22 14:20:51 +00:00
Presubmit Automerger Backend
41eba560d1
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6 2p: b777246dca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Bug: 215517420
Change-Id: I83b554c3353b2ab8502501724d368c92a2fae8f2
2022-02-22 10:37:52 +00:00
Presubmit Automerger Backend
28d902c509
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Bug: 215517420
Change-Id: I93674481947eca5ebabea41d183be9c24c2df029
2022-02-22 10:37:45 +00:00
Presubmit Automerger Backend
b777246dca
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Bug: 215517420
Change-Id: If193c916550c2fe5adc3e251239da40519ab4638
2022-02-22 10:37:44 +00:00
Yuri Ufimtsev
268d1d6dc6
Move all the shared data from biometric controllers to separate utility classes
...
Test: atest SettingsUnitTests
Bug: 215517420
Change-Id: Ic5421cd910ae77d4e7c0a29ae0337edb98a1d3b9
2022-02-22 10:35:45 +00:00