Automerger Merge Worker
99a4643297
Merge changes from topic "am-9cb8f90b609744158faaa6220542aead"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c04510b030
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84c81f27dc
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba1e5f7d00
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d76486764
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 363f246acd
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f14bb1c1be
-s ours
2023-04-19 02:29:05 +00:00
Treehugger Robot
f1fd481d5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c04510b030
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22703367
Change-Id: I6af644137a9a6f27a7aacb5009a711bbf8e1e588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:28:32 +00:00
Bill Yi
0ec6c3c905
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84c81f27dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22703367
Change-Id: I51230460e12bdaeb8185e33d825129313ad9ee87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:28:30 +00:00
Treehugger Robot
8059b59f1f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba1e5f7d00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22701740
Change-Id: I97296ff1b9b1dc130cd60e25cb374ed8a2f7754c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:28:27 +00:00
Bill Yi
101387bda0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d76486764
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22701740
Change-Id: Id4642912225744527bb48a2e834548b87082c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:28:05 +00:00
Treehugger Robot
cc8d99cbc3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 363f246acd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22701732
Change-Id: Ie450e46fd541e8717cb241575134f5cb997c2bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:27:51 +00:00
Treehugger Robot
54e0fca0b7
Merge changes from topic "tc_change_23041807_29" into udc-dev am: b9faf7089d
am: 3d8a22a257
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I452011ff7735a83bdd5a8e91b2ab2c0e84e73864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:27:33 +00:00
Bill Yi
06fd9f0035
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f14bb1c1be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22701732
Change-Id: Idef2b53000992305de841fa8514d6a7a0f8a1acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:27:17 +00:00
Bill Yi
e61e563140
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631
am: e1bef672d7
-s ours am: 6d99f76e84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I7a4ef7bc06793bd2ac82d00b73f9b55765d025b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:26:34 +00:00
Treehugger Robot
520803758a
Merge changes from topic "tc_change_23041807_29" into udc-dev am: b9faf7089d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I25b8c46633526be2b7562f4bfef198fe84febf05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:53:42 +00:00
Bill Yi
7a75e2eea3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631
am: e1bef672d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I2156a63f31fea0a141f4ee93307d7b2a64faa906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:53:34 +00:00
Treehugger Robot
c04510b030
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
Treehugger Robot
ba1e5f7d00
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
Treehugger Robot
363f246acd
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
Treehugger Robot
3d8a22a257
Merge changes from topic "tc_change_23041807_29" into udc-dev am: b9faf7089d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: Id9ef8071049d8570e3229d5dfc0d1113eb9e70d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:47:20 +00:00
Bill Yi
6d99f76e84
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631
am: e1bef672d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I6924d7e200abc434ad93c335b40b79fb62ca49b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:47:15 +00:00
Treehugger Robot
b9faf7089d
Merge changes from topic "tc_change_23041807_29" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631
Import translations. DO NOT MERGE ANYWHERE
2023-04-19 01:43:57 +00:00
Sunny Shao
b0b8ca7e1c
Fix RTL display problem in Open by default
...
- setTextDirection for ListView ih the verified links dialog.
- setCompoundDrawables for TextView in the supported link dialog.
Fixes: 277082703
Fixes: 277084378
Test: manual review
Change-Id: Ib42ed2f04785a5f1803b9d2d95055e4208c9e88f
2023-04-19 09:07:50 +08:00
Becca Hughes
3ac6b141a4
Merge "Rollback decision to merge by package name"
2023-04-19 00:08:57 +00:00
Xin Li
752715c5ca
Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
...
Bug: 275386652
Merged-In: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
Change-Id: If148c3db02f9c6a8845c9ddc02eb466329dddd08
2023-04-18 16:34:29 -07:00
Yuxin Hu
0927e2af1d
Add permission to use GPU service APIs
...
Allow Settings UI to access GPU service APIs,
this allows Developer option UI to toggle ANGLE
as the default system GLES driver.
Bug: b/270994705
Test: m;
Change-Id: I0a6c0bbe03482e4746e0d2a52ce247f4469baaa9
2023-04-18 22:58:39 +00:00
Diya Bera
33fab7e415
Adding owners
...
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
2023-04-18 22:56:31 +00:00
Becca Hughes
ca542c90cd
Rollback decision to merge by package name
...
At the moment settings aggregates by
package name and it has been decided that
we should do per-service instead.
Test: atest & manual
Bug: 278598419
Change-Id: I6b7c8adac4957f1c3382044208e1642d0b6e3fab
2023-04-18 22:15:50 +00:00
Linyu He
f47ecfc82b
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779
am: e6c3d5d893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: I5bbdec5717bc387c305974a7bfccbd513fecb123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:19:25 +00:00
Treehugger Robot
f2160f276e
Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7
am: 4ec47457ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451
Change-Id: Ic9cb5e121608b2fe7368c72275db9a31d412b713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:16:16 +00:00
Linyu He
e6c3d5d893
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: I0a228f9c512ee444a245e67b10a83849e53ed51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:04:09 +00:00
Linyu He
32acd8c90d
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779
am: 3abe7779e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: I04a4b7e9a80ba6effc9f90b32be5c70303671c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:02:30 +00:00
Treehugger Robot
62ca723b6d
Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7
am: 616fd2b0e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451
Change-Id: I3bdbc364829ba0f93454edb2c2a59c3128e2b2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 19:59:30 +00:00
Treehugger Robot
4ec47457ec
Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451
Change-Id: Ib9d623e75db46f94f9b617077c9f7f96926f427f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 19:58:43 +00:00
Linyu He
3abe7779e0
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: Ieb5b5f9da097858de4dfee1928e6ec9ca741a1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 19:56:09 +00:00
Treehugger Robot
616fd2b0e0
Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451
Change-Id: Ic340037c566debd7c5b6275920b361b74e87e7f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 19:51:24 +00:00
Linyu He
e346dc6779
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev
2023-04-18 19:36:45 +00:00
Julia Tuttle
fa5a5a884d
Clarify full screen intent permission text
...
Modify the language to be more user-focused.
Bug: 277938620
Test: builds
Change-Id: I99a4e9cd93fcca7bee5861257086b417e11806e4
2023-04-18 15:10:25 -04:00
Treehugger Robot
6112e583d7
Merge "Revert "Destroy activity in onStop()"" into udc-dev
2023-04-18 19:07:33 +00:00
Liana Kazanova
94f08e4ba1
Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."
...
Revert submission 22338257-turnScreenOnPermission_pregrant
Reason for revert: b/278739832
Reverted changes: /q/submissionid:22338257-turnScreenOnPermission_pregrant
Change-Id: Iada276497c37c0e89a2cde8706394949d468e8e5
2023-04-18 17:47:14 +00:00
Elliot Sisteron
6356de3f9b
Launch work profile entries intent in the profile parent.
...
The screens don't work as expected if they're launched in the work
profile. The reason for this is that Settings handle the user separately
with an extra inside the intent. I assume launching the actual screen in
a separate user is not supported.
Note that I've also:
1. Added a safeguard to make sure that the "active unlock" code path
only occurs in the profile parent — it seems preferrable (see
b/277877289#comment4)
2. Added the user id as an identifier on the intents lauched by the
entries. The reason we do this is to make sure the user id is taken
into account in the PendingIntent#equals implementation. This was
automatically taken care of when launching with the profile context,
but now that we launch everything in the profile parent context we
have to make sure the user id is taken into account
Bug: 278665241
Bug: 277877289
Test: manual
Change-Id: Idcaa31cd56ed64768aa8f069d30d2adeb7269099
2023-04-18 17:24:39 +00:00
Zoey Chen
7026760615
[Settings] Remove the large space when searching language
...
Don't expand the tool bar when users search the language because they will see a large space on the top.
Bug: 254387685
Test: local test
Change-Id: I52fbf4be47885ea6c7d2b6abb75db99c1690edca
2023-04-18 17:20:42 +00:00
Treehugger Robot
687acd81d2
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824
am: 973e55818e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125
Change-Id: Ib7132d81a06345b2d2a36ab4b1f906a8c395c818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 17:19:08 +00:00
Treehugger Robot
2f6ea6addb
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824
am: b24b622c3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125
Change-Id: Ia14eb54b4b0826dee20b761be9a22078849bdeed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 17:18:35 +00:00
Treehugger Robot
b24b622c3c
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125
Change-Id: I655b1178eaea787df684067ee4e09283f3969625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 16:56:25 +00:00
Treehugger Robot
973e55818e
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125
Change-Id: I2a579eab5db50e7209814a126c90f0fb5bcbd2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 16:55:22 +00:00
Treehugger Robot
dc02736824
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev
2023-04-18 16:21:11 +00:00
Philip Junker
04ac0e4a52
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c
am: 821e2b5d8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104
Change-Id: I4f37fd7c7c5b6bd77035aea2a9f03c3478bf0067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 16:18:21 +00:00
Philip Junker
61a9f88c33
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c
am: 632da3759f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104
Change-Id: Id7262f3031d2e0e833ef154510d033dcb62eb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 16:15:02 +00:00
Philip Junker
821e2b5d8b
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104
Change-Id: I35d6b22c7ca33e80abb265a9f0bb1fbaf1eb2279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 15:53:33 +00:00
Philip Junker
632da3759f
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104
Change-Id: Ib6a1346bbf7768360a758fe720452117fbc72d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 15:52:47 +00:00
Philip Junker
c57e5c0e2c
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev
2023-04-18 15:36:55 +00:00
Bill Yi
411d527b94
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696131
Change-Id: Ie14298c9668f64979607171a25d97bae63266787
2023-04-18 14:31:18 +00:00
Bill Yi
7fc6abdfb9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: Id8ec8521ee5f526a2e3e88c310371115cee8011c
2023-04-18 14:29:59 +00:00
Bill Yi
dc1e24b89e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I7e6b0f985caf0ebf223b5556d0074101a748d43e
2023-04-18 14:25:46 +00:00