Jiaming Liu
8b4f036a3f
[automerger skipped] Fix build for jetpack update am: b9f82bed98
-s ours am: 47c2b78f94
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I2fde4d7e483d101e99e4b9274f6bda3454c39031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 08:12:02 +00:00
William Escande
6ea3322de4
Merge "Snoop Logger: fix descriptions" am: 5fd265405c
am: 57f3e9428f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I34edde4f5dc5b5290f796d1bd8b5e8f07eab9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 08:11:05 +00:00
Anvesh Renikindi
3b08c0d9db
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442919
Change-Id: Iff9e2012e64c7776ccfeba98b69afca280ef13b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:18 +00:00
Anvesh Renikindi
928a3c22a6
[automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I57bf736b9fdc9cf9100139a65c0df5d5fd88f7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:13 +00:00
Jiaming Liu
47c2b78f94
[automerger skipped] Fix build for jetpack update am: b9f82bed98
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I6ab1de1556098dc77963331f2f0c2dc14c7aef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:11 +00:00
William Escande
57f3e9428f
Merge "Snoop Logger: fix descriptions" am: 5fd265405c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:21:57 +00:00
Anvesh Renikindi
60763d6941
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property"
2023-02-23 06:22:15 +00:00
Anvesh Renikindi
a54ecedde3
Merge changes from topic "androidx_ae"
...
* changes:
Fix build for jetpack update
Update ActivityEmbedding usage.
2023-02-23 06:22:15 +00:00
William Escande
5fd265405c
Merge "Snoop Logger: fix descriptions"
2023-02-23 05:58:19 +00:00
Henri Chataing
b2e4e3c85f
Nfc: Rename system properties in Nfc settings
...
The nfc properties are now added to system/libsysprop and
were renamed at the same time for homogenity.
Bug: 268219397
Test: m Settings
Change-Id: I496e128b9db225aac583a1e0b91687f78a268b63
(cherry picked from commit 94e898a02b
)
2023-02-23 01:48:42 +00:00
TreeHugger Robot
24c843fb30
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I181ec169fe63702914c012f349dbe327bfbbbe15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:13:57 +00:00
Bill Yi
07b4ad75b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I55edf94ba4c2952f50d2757ee3de2eac8236eccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:13:49 +00:00
TreeHugger Robot
95d0cc1766
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I516ae5d20d4f21a3bc455c02328b873d18a9a427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:13:44 +00:00
Bill Yi
881db50b16
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: Ic1d40a8aad4b268384097ce8ca3e310aeb31bb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:13:13 +00:00
TreeHugger Robot
0e28d1212e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-22 20:59:45 +00:00
TreeHugger Robot
decc8d0759
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-22 20:59:45 +00:00
Henri Chataing
6a7031515e
Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f
am: 4886f28aba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205
Change-Id: I938ce76f23b82ffc4f4b0f95364120dadc7cdb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:16:49 +00:00
Jack Yu
252dd209b3
Show reboot dialog when users disable developer options am: d91e7a0565
am: e1dfe3d417
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204
Change-Id: I7225161683a0b68b6eebf188ec99f39e57a33851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:16:48 +00:00
Jack Yu
86a6c6a9a7
Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c
am: 0797feaf7b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: Id9fd40284b018c8cc3424d6a77c6f6f7bf43da2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:16:45 +00:00
Jack Yu
08c64a4414
Add a new NFC developer setting option for NFCSNOOP am: a2f8944942
am: 81f481fac4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: I28561bde03b8dd3cbf2394ea5c851b15b584da49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:15:02 +00:00
Treehugger Robot
a14b3c6be2
Merge "Change API name" am: a0642974a4
am: f9d1535640
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642
Change-Id: Id8b6e017f93933b3b64b66be9639b203b0fa9e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:37:55 +00:00
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
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
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
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
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