Zoey Chen
6d57de3418
Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017
Change-Id: I7b86992ad5572b2c4bd86b1c5935839bceaa1186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:54:12 +00:00
Yanting Yang
eb028da005
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084
Change-Id: I6d727ab9e5e30f1db9a3b6eb9f0ea63ea44c664d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:52:46 +00:00
Zoey Chen
4d917d990f
Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev
2023-05-12 03:37:37 +00:00
Yanting Yang
f0e440109f
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev
2023-05-12 03:20:14 +00:00
Chris Antol
8e93ac6670
Remove SPA gating from App Cloning click ingress
...
Bug: 277002988
Test: existing tests. flag on by default, no-op unless disabled, which now has access to this otherwise accessible feature
Change-Id: Ic37e4c76d379133f1dbda3c65930ae44afc24f70
2023-05-12 03:03:12 +00:00
TreeHugger Robot
56c76e67ba
Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e
am: d084c192be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345
Change-Id: I40668d14207e16a7df97d76660a1219c7ef4d6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 02:48:25 +00:00
Zoey Chen
fb6b6b0bcc
[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the
...
parent fragment and control the dialog.
Keep the dialog and the locale list after rotation
Bug: 279527362
Change-Id: I349fd9d0fea5b43a8bbb2a23fa60fc4c5436c5cf
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Test: atest LocaleDialogFragmentTest
2023-05-12 02:40:13 +00:00
TreeHugger Robot
8e8499d02a
Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e
am: d1d6fd9d9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345
Change-Id: I36216a7676366bcb94e3d86c7350051de412dce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 02:29:58 +00:00
TreeHugger Robot
d084c192be
Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345
Change-Id: Ibe181103445c0952373064952dd15d34d37ade9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 02:09:25 +00:00
TreeHugger Robot
d1d6fd9d9d
Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345
Change-Id: I2c3a7b4b301c24dea7eb94115e47c5ec6185ccac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 02:05:56 +00:00
TreeHugger Robot
b7b444896e
Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev
2023-05-12 01:34:00 +00:00
Tetiana Meronyk
6dcb9fca35
Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6
am: 43835107e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656
Change-Id: I636ad860c7fe5ed48c5c037a3f7fb0e2283f748d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:51:32 +00:00
Tetiana Meronyk
683d219f70
Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6
am: 53d32efa48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656
Change-Id: I5105c8b7b683d83ad2f7287bac1e1aed2868200d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:42:44 +00:00
Tetiana Meronyk
43835107e7
Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656
Change-Id: I816af33e0e4e6006234f76e58a1dbcf287a45606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:21:52 +00:00
Tetiana Meronyk
53d32efa48
Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656
Change-Id: Ica48008946e313cf559f08fd1c4a79ebaf29c0a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:16:52 +00:00
Tetiana Meronyk
66dba214e6
Merge "Make user creation flow in a single dialog" into udc-dev
2023-05-11 23:43:05 +00:00
Hao Dong
836ee2bade
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
am: 2386847a2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: I504d49a7601e00a8491635deb7b0bf6f5c9c8c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:35:08 +00:00
Hao Dong
6832a32430
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
am: dd373e10e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: I1da1719b323d55674ed01bfe12e9afa52e62075a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:31:44 +00:00
Hao Dong
dd373e10e5
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: Ie5214e9c1dafbbc9fbadcf1cbbdb653a43afc581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:52:55 +00:00
Hao Dong
2386847a2f
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: Ibbea1584e774a5249bfb73d8f3e98b175b963225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:51:36 +00:00
Fangqiu Su
0c341aed7c
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1
am: 942671e18a
am: 1cc65c8dce
am: 3c36f4c88e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310
Change-Id: Ib6f02f00ecd19ac04a596ef5ba5afde397141275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:34:28 +00:00
Yuxin Hu
2757a63fb3
Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366
am: 37dc9f703c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451
Change-Id: Iea42221dfd0db85468936e2e3a6bf8a2d11f27a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:32:18 +00:00
Yuxin Hu
2c1cbacb84
Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366
am: 968a865d75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451
Change-Id: If6fa7f6813163fc7f96b15c553cc680be580e08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:28:28 +00:00
Hao Dong
1eb3724e1f
Merge "Hide description text view if there is overlap." into udc-dev
2023-05-11 22:10:55 +00:00
Yuxin Hu
968a865d75
Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451
Change-Id: I50d5b266a28908e44dfc6671d21764be968c09fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:49:21 +00:00
Fangqiu Su
3c36f4c88e
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1
am: 942671e18a
am: 1cc65c8dce
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310
Change-Id: I0d81ddfa513a5e523c9268384156dab62bae1e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:47:41 +00:00
Yuxin Hu
37dc9f703c
Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451
Change-Id: I17ef944bc6163feee27ea59fcde09f9d65bbd37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:43:22 +00:00
Fangqiu Su
1cc65c8dce
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1
am: 942671e18a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310
Change-Id: I4350f048408914f3d46bfb54a546fc9861c565bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:00:02 +00:00
Yuxin Hu
6e3aba5366
Merge "Add AndroidJUnitTest for developer option switch" into udc-dev
2023-05-11 20:48:57 +00:00
Treehugger Robot
cadb7815c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767
-s ours am: e7d695f07a
-s ours am: ff50032a80
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: Id6a96e0241ad9fd5f2856d1c885cacf7595b2890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:45:50 +00:00
Treehugger Robot
ad626ab75b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767
-s ours am: e7d695f07a
-s ours am: 1be1e662f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: Ie375b8390560b3a2fe6cad6c30533b8d6915626d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:43:06 +00:00
Treehugger Robot
b92621d8b4
Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11
am: 58c8fae9db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: Iefe097182a38f5790a2d935fede1fb264e021d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:39:09 +00:00
Bill Yi
5cdd88f054
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
am: f637cc7f49
-s ours am: 40d95455c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: I891b7994daa03dc2425c9e0b37578adabd372587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:39:04 +00:00
Treehugger Robot
0355076954
Merge "Fix string" into udc-dev am: 81ac516705
am: 0b57a35470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: Iec18c50356c86d742e2c9731ba89e98911aefc6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:38:35 +00:00
Fangqiu Su
942671e18a
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310
Change-Id: I4d7c2aa70600ffecdda7aa467926993732e1fb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:19:48 +00:00
Treehugger Robot
b35a1eb5ca
Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11
am: a785e266a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: I58a383470f24e255d6532ec90373ead93f916fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:03:49 +00:00
Bill Yi
3752af781d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
am: f637cc7f49
-s ours am: e35c4affd7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: I309448f407730296c956ef3ff9bc45611f383307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:03:43 +00:00
Treehugger Robot
9bd80164e2
Merge "Fix string" into udc-dev am: 81ac516705
am: 44c807906b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: I722191069fb3273957f569354179ace9311e805f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:03:25 +00:00
Treehugger Robot
ff50032a80
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767
-s ours am: e7d695f07a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: Ib5851dbbfd91b13e24970394f62365881a41dba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:00:42 +00:00
Treehugger Robot
1be1e662f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767
-s ours am: e7d695f07a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: I44ccdf26e86e100cf552223c3f435876419df046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:00:15 +00:00
Treehugger Robot
58c8fae9db
Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: If3c8f54780ccd351f3096d65e2e08c04ac2e575f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:00:14 +00:00
Bill Yi
40d95455c0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
am: f637cc7f49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: I09e9852e5d5019401c4b9d17aa1b1ad7fff4eb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:00:06 +00:00
Treehugger Robot
0b57a35470
Merge "Fix string" into udc-dev am: 81ac516705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: Ia806f9235c495cd7d97953b5c07b2a66c454a358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:59:03 +00:00
Treehugger Robot
e7d695f07a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: Ie8b6175859af028f1341d807fa08567b5dfae1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:56:48 +00:00
Treehugger Robot
a785e266a1
Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: Ibfde1d3da58ef0a954dc39502d8c6258f5150795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:54:46 +00:00
Bill Yi
e35c4affd7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
am: f637cc7f49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: I44eb539eef07d75771be0e10c871e64a2323fe13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:54:39 +00:00
Treehugger Robot
44c807906b
Merge "Fix string" into udc-dev am: 81ac516705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: I46eb103dc599e26b08d460e49c8fd673a4c1e749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:54:12 +00:00
Fangqiu Su
0a3a5b74a1
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester"
2023-05-11 19:50:53 +00:00
Treehugger Robot
b570c10767
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-11 19:28:21 +00:00
Treehugger Robot
a5af82be11
Merge changes from topic "tc_change_2305100725_23" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
Import translations. DO NOT MERGE ANYWHERE
2023-05-11 19:28:21 +00:00