Diya Bera
b7f615bd4d
Remove duplicate code
...
Bug: N/A
Test: N/A
Change-Id: I74208245ec2d46b803e89a1b6a5a3806e7e69739
2023-02-17 23:57:38 +00:00
Tyler Freeman
44660662f1
fix(tablet): fix magnification banner in dark mode
...
Fix: 269717590
Test: Go to Settings > Accessibility > Magnification. Banner should be light A on dark background
Change-Id: Ia9bb696365afc63f4b94048e95a4a41b5680e621
2023-02-18 06:57:03 +08:00
Edgar Wang
ae2d8a7682
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d
am: 420cc9114f
am: 962a3932d0
am: a782dd0423
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866
Change-Id: I4a2d869ab5df76f0c8ca82159ff30cd7bdef2a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 22:40:09 +00:00
Edgar Wang
b37b1dc2e1
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d
am: 420cc9114f
am: 962a3932d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866
Change-Id: Ib6c0bdc168410c61cd83c7052a549fd207168de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 21:23:41 +00:00
Edgar Wang
a782dd0423
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d
am: 420cc9114f
am: 962a3932d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866
Change-Id: I63d4ba1fa7676d7c83e9a9ac4e838e17e662a434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 21:20:19 +00:00
Edgar Wang
962a3932d0
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d
am: 420cc9114f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866
Change-Id: Ib679057af4da62fe48d94cebc344f477ce438a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 19:51:11 +00:00
Jeff DeCew
bb5d998fef
Do not cache the bubble settings illustration
...
This allows us to load a different asset depending on the configuration of the device.
Test: manual
Bug: 269233648
Change-Id: Ieff757893ca950e649717750a602991e72a943d0
2023-02-17 19:37:16 +00:00
Edgar Wang
420cc9114f
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866
Change-Id: I894b14ab6af7a20469c57b275780597db09d8225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 18:52:37 +00:00
TreeHugger Robot
1e6c6b6f7c
[automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440
am: 966de44fd9
-s ours am: f144ed6e00
-s ours am: 8872d5e8a4
-s ours
...
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446
Change-Id: I508d5e29fa98385f6fdd473c9ab2cb566e90ce8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 18:45:46 +00:00
TreeHugger Robot
44f70036b5
[automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f
am: 510d653b7f
-s ours am: 82736a7d86
-s ours am: b7ba47c9b2
-s ours
...
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445
Change-Id: I3832412752cd2239a0e0f0fe89084aed6b1689c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 18:44:24 +00:00
Edgar Wang
27d53afa8d
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev
2023-02-17 18:10:59 +00:00
TreeHugger Robot
8872d5e8a4
[automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440
am: 966de44fd9
-s ours am: f144ed6e00
-s ours
...
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446
Change-Id: If4c670b0093914650a01822eec2361f0b85b5976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 17:37:11 +00:00
TreeHugger Robot
9bdca81393
[automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440
am: 966de44fd9
-s ours am: f144ed6e00
-s ours
...
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446
Change-Id: Id0658333fcfd4b7b82afcdb94a419c2433557444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 17:36:37 +00:00
TreeHugger Robot
b7ba47c9b2
[automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f
am: 510d653b7f
-s ours am: 82736a7d86
-s ours
...
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445
Change-Id: I480a87927d4fa75df8a18974065a4458ecb62b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 17:36:21 +00:00
TreeHugger Robot
71cc63dcf2
[automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f
am: 510d653b7f
-s ours am: 82736a7d86
-s ours
...
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445
Change-Id: I97f9354c70ead2c5ba7969f8e5b2f5e04d8860d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 17:33:53 +00:00
Jack Yu
733b317406
Add test cases for NfcSnoopLog and NfcVerboseVendorLog
...
Bug: 204397062
Test: make RunSettingsRoboTests
Merged-In: Id12e3c10dc04816d4a69692b2d922840a8e84c61
Change-Id: Id12e3c10dc04816d4a69692b2d922840a8e84c61
(cherry picked from commit bcf2efe31e
)
2023-02-17 17:29:56 +00:00
Jack Yu
d91e7a0565
Show reboot dialog when users disable developer options
...
When NFC detailed logging mechanisms are enabled and users try to
disable develoepr options, show reboot request dialog to make sure
NFC logging mechanisms are also disabled.
Bug: 204397062
Test: manual
Merged-In: I531c85fd77934ad7821c480df07465a8cd8f24f9
Change-Id: I531c85fd77934ad7821c480df07465a8cd8f24f9
(cherry picked from commit d270f29cc8
)
2023-02-17 17:29:15 +00:00
Jack Yu
8f1794043c
Add a new NFC developer setting option for NFC vendor verbose log
...
Add a new developer setting option to enable vendor verbose log.
Bug: 204397062
Test: manual
Merged-In: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
Change-Id: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
(cherry picked from commit 3d2aff896e
)
2023-02-17 17:28:36 +00:00
Jack Yu
a2f8944942
Add a new NFC developer setting option for NFCSNOOP
...
Add a new developer setting option to enable full NFCSNOOP log.
Bug: 204397062
Test: manual
Merged-In: I3fd34500e5e7093c9d77ff737987a35f6866814e
Change-Id: I3fd34500e5e7093c9d77ff737987a35f6866814e
(cherry picked from commit b71de640b5
)
2023-02-17 17:27:38 +00:00
Carbo Kuo
bd18ca11d0
Merge "Migrate the About page in Settings."
2023-02-17 16:32:54 +00:00
TreeHugger Robot
f144ed6e00
[automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440
am: 966de44fd9
-s ours
...
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446
Change-Id: I0d754479cb73df75e32008aa6f8a65579e9906fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 16:11:55 +00:00
TreeHugger Robot
82736a7d86
[automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f
am: 510d653b7f
-s ours
...
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445
Change-Id: Id346fa53a9bf4840483f233516e265dbf552ce54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 16:06:49 +00:00
TreeHugger Robot
966de44fd9
Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446
Change-Id: I8e50b809f73f0f4913672f87f797d9fb4700be99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 15:13:11 +00:00
TreeHugger Robot
510d653b7f
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445
Change-Id: I743f719b6d2561c2f1badd44b36ed623c0206a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 15:12:16 +00:00
TreeHugger Robot
6014caf440
Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev
2023-02-17 14:47:37 +00:00
TreeHugger Robot
67b00f002f
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev
2023-02-17 14:38:14 +00:00
TreeHugger Robot
5b2a3a2d8d
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346
am: 0204d085b7
-s ours am: 6c26d070af
-s ours am: 89602b292c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: Id91a2805a3a2b97dd6db4a8252357eae8e0e6c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 13:48:09 +00:00
menghanli
5da5dfccb8
[automerger skipped] RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402
am: 46ce9ae5ac
-s ours am: 89d198b513
-s ours am: a91833f108
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: Icd00c5e3ba0720c119e912fe70e7a4ebfd5fa3c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 13:48:06 +00:00
Julia Reynolds
9f7af5946e
Reduce jank on DND apps page
...
1) Remove call to redisplay the api when registering our app listener -
this meant all preferences were always removed/readded on page load
because the app list isn't ready at that time
2) Stop rebuilding the UI for events we don't care about
3) Keep existing preferences when possible and just do the diff of prefs
that need to be added/removed
Fixes: 234298144
Test: ZenModeAddBypassingAppsPreferenceControllerTest
Test: ZenModeAllBypassingAppsPreferenceControllerTest
Test: manually view page; add & remove apps that have dnd breakthrough
Change-Id: I57b36d36135dd25d1d2fd73073cf6b7a033659a6
2023-02-17 13:39:19 +00:00
TreeHugger Robot
89602b292c
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346
am: 0204d085b7
-s ours am: 6c26d070af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: I4470c7c0e9fd1f785f05a11fa208a5e04ba845a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 12:40:06 +00:00
menghanli
a91833f108
[automerger skipped] RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402
am: 46ce9ae5ac
-s ours am: 89d198b513
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: I3188bc57d8de4f166ff7145967df11e3294e72e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 12:40:02 +00:00
TreeHugger Robot
43870f385d
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346
am: 0204d085b7
-s ours am: 6c26d070af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: Icf28366a363423de6c0ed391c667be3679481e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 12:37:31 +00:00
menghanli
2916f6793d
[automerger skipped] RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402
am: 46ce9ae5ac
-s ours am: 89d198b513
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: I27d856ae70110c3a170b369f5ee97fc189b59ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 12:37:25 +00:00
TreeHugger Robot
6c26d070af
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346
am: 0204d085b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: I27e0cc692d750d74512cde54366c1daa949c32f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 11:10:37 +00:00
menghanli
89d198b513
[automerger skipped] RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402
am: 46ce9ae5ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: I317e4c1413ad0acec55b06520a23e1a21d8889ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 11:10:35 +00:00
Bonian Chen
9380ce71c6
Merge "[Settings] Re-enable previous work on data saver"
2023-02-17 10:37:05 +00:00
TreeHugger Robot
0204d085b7
Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: I863c2cdc26bfba89b9404ddad19a30e8a53cdfc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 10:14:01 +00:00
menghanli
46ce9ae5ac
RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270
Change-Id: I291a61602816049647592c17588771ece1cfcc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 10:13:55 +00:00
TreeHugger Robot
1692714346
Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev
2023-02-17 09:02:46 +00:00
Bonian Chen
2115d0e495
[Settings] Re-enable previous work on data saver
...
Previous work on data saver performance got disabled, this is a change to re-enable it.
Bug: 249502488
Test: build pass
Change-Id: I7264b1e8c21a789db358e0aae70a2cf0ce09ebba
2023-02-17 06:21:38 +00:00
Chaohui Wang
f37d638458
Disable the middle pages during development
...
Set isEnabled to false will prevent these middle pages which under
development get accidentally displayed to users.
During development, please flip isEnabled() of each page to true or
flip SpaEnvironment.IS_DEBUG to true to test these pages.
Bug: 244122804
Test: Manually with Settings
Change-Id: I5c3f835cfa3457b711d224ca37aa5d2b9a248feb
2023-02-17 06:16:09 +00:00
Edgar Wang
78b6a400af
Move tablet resources to product overlay folder
...
Bug: 243906265
Bug: 243888869
Bug: 243888344
Bug: 243889662
Bug: 244271773
Test: rebuild & visual
Change-Id: Ia587aa3162036c5b9797cfe38d20aa396071632e
2023-02-17 05:25:36 +00:00
Jiaming Liu
b9f82bed98
Fix build for jetpack update
...
Fix build for jetpack update
Bug: 265818545
Test: build
Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a
)
2023-02-17 04:15:28 +00:00
Diego Vela
42004f3b6b
Update ActivityEmbedding usage.
...
Update ActivityEmbedding usage.
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796
)
2023-02-17 12:04:26 +08:00
Arc Wang
dd97d9cc71
Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property
...
Future WM Jetpack library updates will ask for the property to
enable ActivityEmbedding feature.
Bug: 264733035
Test: build pass
Change-Id: I0f5e5a10250049fb9425eac7c113b803b6701cc7
Merged-In: I0f5e5a10250049fb9425eac7c113b803b6701cc7
2023-02-17 11:25:23 +08:00
Darrell Shi
86113ae01f
Hide "additional info" when active dream does not support.
...
Only show the "additional info", which displays dream complications,
when supported by the user selected dream.
Test: make -j86 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"
Test: verified on device switching between different dreams
Bug: 223860510
Fix: 223860510
Change-Id: I63872ea9ab9f42be47f8e2f7c3835b55056e6588
2023-02-17 00:40:02 +00:00
Florian Mayer
65116faa29
Disable MTE developer option if device config overrides it
...
On the backend, the device config would already override the setting by
the UI.
Bug: 269523554
Change-Id: Idd249e060a275b58a399349f202fc68b42964eb0
2023-02-16 15:37:38 -08:00
Florian Mayer
36dd04b1be
Fix string annotations.
...
The char limit was applied to the wrong string.
Change-Id: I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7
2023-02-16 22:49:35 +00:00
Carbo Kuo
107d7fc5c6
Migrate the About page in Settings.
...
This change adds the "About" page and the "Device name" Preference.
However, due to the lack of editable text support in the alert dialog (SPA widget), the device name can't be changed at the moment.
Bug: 269486170
Test: manual, see screenshots.
Change-Id: Ie6b034d82b1718c8f22366ef525fd6d36e4df9ad
2023-02-16 18:14:36 +00:00
Steve Elliott
131598bc14
Update unseen notif filtering settings string
...
Bug: 267963644
Test: verify string changed in Settings > Notifications
Change-Id: Icc6db108d84eeb56192318a7ddba6505eaf1d262
2023-02-16 16:47:55 +00:00