TreeHugger Robot
4fe83b61ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235
Change-Id: Icc4d112b712ae5ba0b1a150ff4bff1cb84b26ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:35:21 +00:00
Bill Yi
ed43940526
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6
-s ours am: e6613a454e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I39e4eed9088fd5cbb66bb0d35ccf29803b4b5759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:35:09 +00:00
Bill Yi
9d76bd7a1f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e9765bba2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235
Change-Id: I8fe8a6b565eaa8500f2404d446ac3c9d230f0d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:34:57 +00:00
TreeHugger Robot
c79be68440
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I9adde2ee67544bbe9efc248a08a048eb8b65785a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:30:03 +00:00
Automerger Merge Worker
b13d27ffe5
Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours am: 7a0b1e186d
-s ours" into tm-d1-dev-plus-aosp
2022-07-23 02:29:52 +00:00
Bill Yi
9dd5145c74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I96d8a1c29cb04a5dc84d871d9d58593f18233991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:42 +00:00
Bill Yi
7c0e477837
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours am: 7a0b1e186d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I0ba8bf2a232f5be9b3579dc51d14570b88c0e86c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:34 +00:00
Bill Yi
71eaa44916
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours am: 002496b1e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: Ida0da358fe3838e6190b2d8fa9b189fdb141e76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:29 +00:00
Bill Yi
f97e8519cf
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours am: 002496b1e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: Ic1c09df378ccae0e9bd3c8a5555205498010f272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:13 +00:00
TreeHugger Robot
7da6e7a960
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I7b9c981495db2c4233f959e7b217c51327d0e779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:28:38 +00:00
Bill Yi
e6613a454e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I7e86c90d74cd7882321631a9db4a0b8a2732e33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:28:11 +00:00
TreeHugger Robot
1ea00326ca
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-23 02:03:07 +00:00
TreeHugger Robot
96bc6ca196
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-23 01:56:10 +00:00
Bill Yi
002496b1e1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I1d9d706614d5157df413756a19ce0a45276aee33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 01:35:38 +00:00
Bill Yi
7a0b1e186d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I10404af323f5abe0aaae3479eace278d23963828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 01:33:46 +00:00
TreeHugger Robot
522afb0256
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d478bb07d2
-s ours am: b225e7ebac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392232
Change-Id: I960d491b8650ccc5535cbfa4f89f4b537403f938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 23:17:40 +00:00
Bill Yi
d1d85bea8e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d34c775b59
-s ours am: 21bb02eedb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392232
Change-Id: If961b4aab69d0de6cf86a48ccf3ca12ce2ca8c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 23:17:21 +00:00
TreeHugger Robot
b225e7ebac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d478bb07d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392232
Change-Id: I28e1cf906ec69bab48aedaae139d3b17af607ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 22:59:16 +00:00
Bill Yi
21bb02eedb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d34c775b59
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392232
Change-Id: I0dcf82e38fc4afdf4f427596e6a7d17fd9585df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 22:58:56 +00:00
TreeHugger Robot
d478bb07d2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-22 22:42:33 +00:00
Bill Yi
643075cd64
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2
-s ours am: d20855f6fb
-s ours am: 716c2083aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034
Change-Id: Id93165799e32a6e4d2c6948dc8f0842cf5741656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 22:05:36 +00:00
Bill Yi
a5adddaf8b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2
-s ours am: 45569adeed
-s ours am: bc8a2ee1bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034
Change-Id: Idbe0350149e66f63391c9aefe9a85b34b8eeea65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 22:01:34 +00:00
Bill Yi
716c2083aa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2
-s ours am: d20855f6fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034
Change-Id: Ib9bb29a4c7d794e6e7ac76c6f5fbc773226dd197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 21:57:27 +00:00
Menghan Li
59d3766914
Merge "Remove obsoleted code: AccessibilityGestureNavigationTutorial"
2022-07-22 21:52:26 +00:00
Bill Yi
bc8a2ee1bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2
-s ours am: 45569adeed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034
Change-Id: Iae0af30f18592358d91b89a1dc5ad1a614eabc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 21:52:24 +00:00
Bill Yi
d20855f6fb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034
Change-Id: I8a3edb5f1bfb14b2c87c0d39e703337ea2f97a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 21:31:51 +00:00
Bill Yi
45569adeed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034
Change-Id: I048a1c220b7c758c8eb1c7a43fbeb1f8be41833d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 21:31:16 +00:00
Luigi Zevola
8e8c3c2b1f
Merge "Revert "Grant CONTROL_UI_TRACING permission to Settings app""
2022-07-22 21:11:31 +00:00
Luigi Zevola
1177e857af
Revert "Grant CONTROL_UI_TRACING permission to Settings app"
...
Revert submission 19391474-yukawa-b172444310
Reason for revert: b/239969206
Reverted Changes:
I34bc22392:Allow com.android.settings to have CONTROL_UI_TRAC...
I2165ce38e:Grant CONTROL_UI_TRACING permission to Settings ap...
Change-Id: I4c9db66d852baa25c7f6f7a435639017140f9d5d
2022-07-22 20:38:01 +00:00
Yohei Yukawa
00ac86939d
Merge "Grant CONTROL_UI_TRACING permission to Settings app"
2022-07-22 18:49:43 +00:00
Bill Yi
011d462ac4
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I0f062cb7d34bab7dafe000abdd96d50e7acd1db4
2022-07-22 16:58:27 +00:00
Yohei Yukawa
16db5370eb
Grant CONTROL_UI_TRACING permission to Settings app
...
We are going to guard the following IPCs with CONTROL_UI_TRACING
permission [1].
* IWindowManager#startWindowTrace()
* IWindowManager#stopWindowTrace()
* IInputMethodManager#startImeTrace()
* IInputMethodManager#stopImeTrace()
For QS DevelopmentTiles to continue being allowed to access those
IPCs, this CL gives CONTROL_UI_TRACING to the Settings app.
[1]: Ibdeb38dc9a066cb8ed2904adcdac29014b166526
2ad02a383b036b02a836a50a43c679a17c2fde6b
Bug: 172444310
Test: Manually verified as follows.
1. build aosp_coral-userdebug and flash it.
2. adb shell dumpsys package com.android.settings
3. Verify that
android.permission.CONTROL_UI_TRACING
is granted.
Change-Id: I2165ce38e5897ea0321fad9d54047e964a0a6ddb
2022-07-22 07:45:04 -07:00
menghanli
33dda10ae7
Remove obsoleted code: AccessibilityGestureNavigationTutorial
...
Don't show the button tutorial when changing into sysem button navigation
Bug: 197695932
Test: make RunSettingsRoboTest
Change-Id: Ied90a602cd3228ee6f36b4b50fb1c019429a271e
2022-07-22 15:38:09 +08:00
Kelly Zhang
b1cb90f7f1
Merge "Enable predictive back gesture for Settings app."
2022-07-22 07:30:43 +00:00
Bill Yi
1e9765bba2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib8c45dd3a435a2e409918b578428fdb7dd131243
2022-07-21 23:17:43 -07:00
Wesley Wang
01eabef95b
Merge "Update battery optimize page states condition"
2022-07-22 06:16:08 +00:00
Bill Yi
b99222d2b8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id0ce4d8486c79d82581c85ef17655d076052e0cc
2022-07-21 23:13:46 -07:00
Bill Yi
babd7f1cc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8836b6918c0c9a9527bb6a95a1abb9ab53a54e9c
2022-07-21 23:10:10 -07:00
Bill Yi
04531538c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic6afe4d66b49f6e961977912550f1f3f724f816f
2022-07-21 23:02:36 -07:00
Bill Yi
d34c775b59
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib1f37eb6e359d977359e2fd67f60ffe03ef28896
2022-07-21 23:01:08 -07:00
menghanli
ae7411b999
Remove Theme.AlertDialog declaration in accessibility dialog layout
...
Root cause: Settings application level style includes the alertDialogTheme, No need to set Theme.AlertDialog for dialog layout.
Solution: Remove unnecessary attrs.
Bug: 225764984
Test: Manual testing
Change-Id: Ic3607ec70e97a3d1023d002c006cffc9715d7fb6
2022-07-22 12:56:26 +08:00
Vincent Wang
9937a51355
Merge "Fix Delete face model button flicker"
2022-07-22 04:17:43 +00:00
Bill Yi
2d0fd7f558
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I893779ffabea7e7f41c1ecdf3e0f21c5f3183f2b
2022-07-21 20:01:30 -07:00
kellyz
1bda6428c2
Enable predictive back gesture for Settings app.
...
Bug: 238729272
Test: manually tested on device
Change-Id: Ib75902d1d7bbd289705cb62ef00d5840676bda72
2022-07-22 02:27:01 +00:00
Julia Reynolds
de6ed69527
Merge "Improve App notification loading" into tm-qpr-dev am: 4ab5255893
am: 6292d9ff8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19290333
Change-Id: Ifb860cdab87fc01ba578346167361a1d30ae9695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-21 21:06:49 +00:00
Julia Reynolds
6292d9ff8c
Merge "Improve App notification loading" into tm-qpr-dev am: 4ab5255893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19290333
Change-Id: Iac930f653c146436863978c1c98439d2e63a6837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-21 20:48:46 +00:00
Julia Reynolds
4ab5255893
Merge "Improve App notification loading" into tm-qpr-dev
2022-07-21 20:30:21 +00:00
TreeHugger Robot
d81bf8cd3a
Merge "Bool to note Pending Intent bug fixed"
2022-07-21 15:13:10 +00:00
Simon Wingrove
da96b47ce8
Bool to note Pending Intent bug fixed
...
A workaround can be used to cover for the fact that PendingIntents sent
by Settings might differ only by Intent extras (and thus be wrong). This
bool notes that the issue is fixed so the workaround code can be
dropped.
Bug: 238605613
Test: manually
Change-Id: I478dd5fbd53d1dafd049e392a186d9796dd179cb
2022-07-21 10:27:30 +00:00
Neil Fuller
d8b54cd28d
Merge "Change high/low bound logic for manual date/time"
2022-07-21 09:22:48 +00:00