Henri Chataing
4886f28aba
Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205
Change-Id: I082c6fda1b1420dd49a2507ea87e8262b341be8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:31:00 +00:00
Jack Yu
e1dfe3d417
Show reboot dialog when users disable developer options am: d91e7a0565
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204
Change-Id: If1a8b237f58bcbb1c07a27b054be09a7530922f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:30:54 +00:00
Jack Yu
0797feaf7b
Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: Ic9c47d49121184737369e041048a678dda53bf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:30:50 +00:00
Jack Yu
81f481fac4
Add a new NFC developer setting option for NFCSNOOP am: a2f8944942
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:30:37 +00:00
Treehugger Robot
f9d1535640
Merge "Change API name" am: a0642974a4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642
Change-Id: I3a96da519c41151b57e7580b0816101590322b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:21:01 +00:00
Diya Bera
65721576d8
Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844
Change-Id: If6a80674fa3d00f6d5a82110df1f2bab50693ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:15:52 +00:00
Henri Chataing
4de9ff1a8f
Merge changes from topic "nfc_logging_control"
...
* changes:
Add test cases for NfcSnoopLog and NfcVerboseVendorLog
Show reboot dialog when users disable developer options
Add a new NFC developer setting option for NFC vendor verbose log
Add a new NFC developer setting option for NFCSNOOP
2023-02-22 17:12:46 +00:00
Treehugger Robot
a0642974a4
Merge "Change API name"
2023-02-22 16:59:10 +00:00
Diya Bera
041d00afac
Merge "Remove duplicate code" into tm-qpr-dev
2023-02-22 16:44:06 +00:00
Jeff DeCew
05c43c2edc
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805
Change-Id: Ie06a7625785dd3c82a50d5e3b1e24b44b54c02ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 01:38:58 +00:00
Jeff DeCew
3c5bbbdb0c
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev
2023-02-22 01:06:41 +00:00
Android Build Coastguard Worker
507a42e4bd
Snap for 9635238 from 694742152d
to tm-qpr3-release
...
Change-Id: I41cf7e92bac7878d9b93c08d3ff63f8b3a32a160
2023-02-22 00:25:25 +00:00
TreeHugger Robot
2ecd05add8
Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350
Change-Id: I3b215c7f5c824c04837cc84f2af1c81e0702aa6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:47:05 +00:00
Jiaming Liu
c0e3bdd218
[automerger skipped] Fix build for jetpack update am: da7f685695
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 1c0af48f8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482786
Change-Id: I7f4db3fa4fdc97b6957c1e23938c6b85fea2c117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:34:00 +00:00
Diego Vela
798e242964
[automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a
-s ours
...
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 d2dfc4285e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482785
Change-Id: Ib0c2a6ededbfc7d0c4caf4cbe85a4420d7967e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:33:57 +00:00
TreeHugger Robot
694742152d
Merge "Reduce jank on DND apps page" into tm-qpr-dev
2023-02-21 18:15:25 +00:00
Bill Yi
b68f49055e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6666b3bab75c42875a1bb406e695aef2813b60d1
2023-02-20 23:39:33 -08:00
Bill Yi
26e205dfb9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic1987daee94e5d3f6ec814ea6fd12dac465b53b4
2023-02-20 23:37:16 -08:00
Android Build Coastguard Worker
2305ada923
Snap for 9631501 from 8547eb1921
to tm-qpr3-release
...
Change-Id: Id31cb3d3ec60e9df2572ce5d6faa49a393f44dbd
2023-02-21 00:25:27 +00:00
Jakub Rotkiewicz
c0a7e8f8f0
Snoop Logger: fix descriptions
...
Test: refactoring CL. Existing unit tests still pass
Merged-In: Ie6a6b27247896e2a9a410197135e44a22ab1428c
Change-Id: Ie6a6b27247896e2a9a410197135e44a22ab1428c
2023-02-20 15:12:31 +00:00
menghanli
0f1f626537
fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798
Change-Id: I013125cc4d8d979a916a5b585c175698d4502dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 03:01:13 +00:00
Hieu Dang
8115b87ea3
Change API name
...
Change getCreateBondCaller to getPackageNameOfBondingApplication
Bug: 269604212
Test: atest BluetoothDeviceTest
Tag: #refactor
Change-Id: Ib596f94a6a718069ca9fb3a1c572ee3583f7504b
2023-02-19 15:11:42 +00:00
Android Build Coastguard Worker
a492f14e0b
Snap for 9627464 from aa189347fb
to tm-qpr3-release
...
Change-Id: I301b34caa254982a600814710656c87e790b9591
2023-02-18 22:25:27 +00:00
Jiaming Liu
da7f685695
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
)
(cherry picked from commit 5a6444776a
)
(cherry picked from commit 1c0af48f8c
)
2023-02-18 17:01:11 +00:00
Diego Vela
585a7f3c7a
Update ActivityEmbedding usage.
...
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796
)
(cherry picked from commit 65bb5a09f4
)
(cherry picked from commit d2dfc4285e
)
2023-02-18 16:27:45 +00:00
menghanli
8547eb1921
fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences
...
Fix: 269717670
Test: 1. Go to Settings > Accessibility shortcuts > accessibility button & gesture.
2. Observe The Gesture's picture.
3. Go to any other accessibility's shortcut.
4. Observe the picture of the Use accessibility gesture. #2 should look like #4
Change-Id: I11f64648412c9795383d356e80d9dd499095f53b
2023-02-18 13:53:24 +08:00
Menghan Li
888f534cef
Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796
Change-Id: If09f5e93946ec39b2a8848de07b9c331f2a57dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-18 03:36:43 +00:00
Tyler Freeman
0572328763
fix(tablet): fix magnification banner in dark mode am: 44660662f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797
Change-Id: Ide63caf3bfb6e717f8432f759e0767e8624001ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-18 03:35:51 +00:00
Menghan Li
aa189347fb
Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev
2023-02-18 02:43:12 +00:00
Android Build Coastguard Worker
df92aaa7db
Snap for 9625236 from 27d53afa8d
to tm-qpr3-release
...
Change-Id: I1e22d9cbf7a8ffd7026e07da21c85c51c7c17f0a
2023-02-18 02:25:16 +00:00
menghanli
e1ce633dd4
fix(tablet assets): update a11y button navigation asset for tablets
...
Fix: 269707768
Test: Go to Settings > Accessibility > Accessibility shortcuts > Accessibility button > Location to "Navigation bar".
Change-Id: I2d56a104848c93d8e6d138c849d05b4a77388c3b
2023-02-18 08:43:36 +08:00
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
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
Edgar Wang
27d53afa8d
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev
2023-02-17 18:10:59 +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
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
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
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
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