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
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
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
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
Wesley Wang
01eabef95b
Merge "Update battery optimize page states condition"
2022-07-22 06:16:08 +00: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
Vincent Wang
9937a51355
Merge "Fix Delete face model button flicker"
2022-07-22 04:17:43 +00: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
Vincent Wang
65f53e98e3
Fix Delete face model button flicker
...
Update the visibility of button in onCreate & onActivityResult to
avoid button flicker
Bug: 191112124
Test: Reference reproduce step in b/191112124
Change-Id: I68e42433631db27e3f8f03ab4fc68e2326852f9b
2022-07-21 09:06:51 +00:00
Bill Yi
3bab68f912
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31
-s ours am: 69dee8d4a8
-s ours am: ba0a0c61fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821
Change-Id: Ic5723bd15ac104fdd1179be16e1d34a1346c928e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 16:58:11 +00:00
Bill Yi
ba0a0c61fb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31
-s ours am: 69dee8d4a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821
Change-Id: I220740fab54098c73118a4c3f5edbcd871593274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 16:54:53 +00:00
Bill Yi
17ab4dca57
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31
-s ours am: 9f2d455437
-s ours am: b393114b83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821
Change-Id: I394c573ba319636d23702b256c31e01da718e89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 16:53:18 +00:00
Bill Yi
b393114b83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31
-s ours am: 9f2d455437
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821
Change-Id: I7779d4f4cdb32e775152de3da0a5479fc03ac389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 16:40:51 +00:00
Bill Yi
9f2d455437
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821
Change-Id: If9b6741a081ae169312a2a340b65637951abc96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 16:33:30 +00:00
Bill Yi
69dee8d4a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821
Change-Id: Icc93244f4cce2e97f1698939779b6e693e478f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 16:32:49 +00:00
Julia Reynolds
e90507373c
Improve App notification loading
...
1) Use UiBlocker, for better animations for apps with a lot of channels
2) Only load data in onResume, because the data loading step in some
of the controllers is expensive
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Test: load small channel and large (6000ish) channel app pages
Test: load individual channel pages
Test: load in-app channel shelf UI
Fixes: 215072888
Change-Id: I9a1c96f75b02f94b3ffc529d17d9c0cad7752de1
2022-07-20 15:27:52 +00:00
TreeHugger Robot
ef289f99b5
Merge "Refactor Battery Chart View State Controll"
2022-07-20 13:34:35 +00:00
Zaiyue Xue
d4f9588a3d
Refactor Battery Chart View State Controll
...
When users click the battery chart, the orignal behavior is that the view changes the state by itself.
This cl refactors the bahavior to that the view callbacks to the controller, and
the controller changes the view's state.
In this way, the controller is the only source of truth of the state.
This meets the controller-view model.
Test: manual
Bug: 239491373, 236101166
Change-Id: I754ded2dba20319f1571374dfdbef27f2420ed78
2022-07-20 09:38:23 +00:00
Sorin Basca
4bb1562c56
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc
-s ours am: 5781b7ab3a
-s ours am: 0085dcc80c
-s ours am: b9cd87f468
-s ours am: fec750d98f
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: I88fe318dc436f21fb07ffc8e2b3c76ac0bba47a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 07:43:28 +00:00
Sorin Basca
c8b09463a9
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0
-s ours am: ea4c4757bb
-s ours am: b3fb29a4e3
-s ours am: 9cef5199a5
-s ours am: d07b2242fa
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Id768186c959ee0fa195719abe46ad2dfecd6820d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 07:43:15 +00:00
Sorin Basca
fec750d98f
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc
-s ours am: 5781b7ab3a
-s ours am: 0085dcc80c
-s ours am: b9cd87f468
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Ic024b1ae2cd93580472f9da586881df044d8b5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 07:11:20 +00:00
Sorin Basca
d07b2242fa
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0
-s ours am: ea4c4757bb
-s ours am: b3fb29a4e3
-s ours am: 9cef5199a5
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Iefd343d353203140d856945fb504bbe9ca93d02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 07:11:06 +00:00
Sorin Basca
b9cd87f468
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc
-s ours am: 5781b7ab3a
-s ours am: 0085dcc80c
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Ia3ec9464567b759ab02b1231af36ae78da7799a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 06:47:13 +00:00
Sorin Basca
9cef5199a5
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0
-s ours am: ea4c4757bb
-s ours am: b3fb29a4e3
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Idb5adda6eb8b19760fb1a335ee4d3fd8cdde6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 06:47:07 +00:00
Sorin Basca
0085dcc80c
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc
-s ours am: 5781b7ab3a
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: I01c4d0a739da9f35f0c45561a04cc8273969bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 06:26:16 +00:00
Sorin Basca
b3fb29a4e3
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0
-s ours am: ea4c4757bb
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: I8cdf0303f4a286ebc74bcb2af74aac2598075805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 06:26:05 +00:00
Sorin Basca
5781b7ab3a
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: I9f616094bf9b1e54edd58918e6504885207f04e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 05:55:36 +00:00
Sorin Basca
ea4c4757bb
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Id9c27926a1f4cf518aa4c9b0ba69ed51f7dda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 05:55:23 +00:00
Sorin Basca
6a043ec5dc
Merge "Use Mockito 4.6.1 API"
2022-07-20 05:32:35 +00:00
TreeHugger Robot
1489a54577
Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev am: 6e14ff02e8
am: b47e7b4248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19192851
Change-Id: I7772126785874bfa190e70003221c5a8a9e39ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 03:07:12 +00:00
TreeHugger Robot
b47e7b4248
Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev am: 6e14ff02e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19192851
Change-Id: I832dcbc2fa78a81f9d64169d80cdc5a9aed5df4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 02:48:33 +00:00
TreeHugger Robot
6e14ff02e8
Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev
2022-07-20 02:22:44 +00:00