Commit Graph

123671 Commits

Author SHA1 Message Date
Bill Yi
5f5bbed59b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb -s ours am: 956f1001fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134

Change-Id: I34d00cfb2c7bed7f46f7e8e93b3dc80d60483834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 06:44:20 +00:00
Bill Yi
7d3b1ec887 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d -s ours am: f99e320351 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134

Change-Id: I2ef85c608abe4b09a6bf70414ec86a56cf13b535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 06:44:13 +00:00
Bill Yi
fab2ce4721 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed -s ours am: e8971c92c5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132

Change-Id: I4b9d727aba15a389e5fe2948b5d6ea83e337dfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 06:44:03 +00:00
Bill Yi
bc8a415353 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf -s ours am: 825c3da34d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132

Change-Id: I2327a926433591ac38c45d1c3fb776d4fe6ff15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 06:43:48 +00:00
Bill Yi
88df82c60a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e -s ours am: b1a3ff1600 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130

Change-Id: I0a4b8c006449d3448e22f93e1f5d4c14030fc950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 06:43:31 +00:00
Bill Yi
dcd8de2e0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e -s ours am: 4cd3e99f74 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130

Change-Id: Ic10c6177bdab820bb9c3ddb5511dd5b97bd1d821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 06:43:11 +00:00
Bill Yi
956f1001fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134

Change-Id: Ie81f5599817d22524385f696547f38d7aac1f636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:40:39 +00:00
Bill Yi
f99e320351 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134

Change-Id: I57243eb7e8a721413556490dfbeb8c1e5d195aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:40:30 +00:00
Bill Yi
e8971c92c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132

Change-Id: Ie25abe3450df2ef4755b4541aa9b26bd070b576f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:40:22 +00:00
Bill Yi
825c3da34d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132

Change-Id: I9b1147149ac65845a75dcb4da5aa6ee2588a4e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:39:57 +00:00
Bill Yi
b1a3ff1600 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130

Change-Id: I6860552138d10e6f692a4731e7f4cf1de17c1eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:39:37 +00:00
Bill Yi
4cd3e99f74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130

Change-Id: I920208c679fdc692aa73d6b0df6210b113d95c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:39:21 +00:00
Bill Yi
16148bb1bb Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-19 04:54:01 +00:00
Bill Yi
7fc901a9ed Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-19 04:54:01 +00:00
Bill Yi
5bd7827d1e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-19 04:54:01 +00:00
Treehugger Robot
d5afbf4bbc Merge changes from topic "tc_change_23041807_29" into udc-dev am: b9faf7089d am: 520803758a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129

Change-Id: I1a36762a0d1e95dc29c8edffa88f68ed0b56cf36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 02:29:52 +00:00
Bill Yi
a59fc3db5e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631 am: e1bef672d7 -s ours am: 7a75e2eea3 -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: I4454552ce90ccff6c69688eebb976dea052f2c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 02:29:46 +00:00
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
Becca Hughes
3ac6b141a4 Merge "Rollback decision to merge by package name" 2023-04-19 00:08:57 +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
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
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