Bill Yi
355f78acc6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours am: 8a85b26086 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: Ic42b55f7d717602f495c2c0811f27f1232157828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:07:59 +00:00
TreeHugger Robot
f1de435387
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours am: ccb5c5f102 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: Ia269aa0065b21e4dc6bcb9895c10e30471898a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:07:37 +00:00
Bill Yi
238cc56c4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours am: 24666f139a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: I620c03914e306d8fddfd59c77d99e6555015efc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:07:32 +00:00
Joshua Mccloskey
5f34ae0309
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 3dd64a3e25 am: 0f27b0ab5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: I49fc372a55010ec9979515b4ab07193ae7770af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:07:26 +00:00
Joshua Mccloskey
63451e68e5
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 7747c3b5dd am: 569a8b4073
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Iae0613e80126b30bd3af29c459a2e8e5859e3111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:07:01 +00:00
Joshua Mccloskey
8012fcd59b
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 7747c3b5dd am: c665d436d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: I506c28d6c531c1e3582d8553235b9fc94799a3f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:05:33 +00:00
TreeHugger Robot
c87249a086
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: I9d7fe289cca91bc36228e92d8d95315ffe5a51f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:50:44 +00:00
Bill Yi
43aefd5e84
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: Ia00f3b7b516d14ba997c7a09d50c67d1e09fd20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:50:37 +00:00
TreeHugger Robot
ccb5c5f102
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: Ib4d436259f29de4248b52f43ac012ae9f6820b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:49:31 +00:00
Bill Yi
24666f139a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: I711ed0b34e16ac5dfc8d05afd3133ffa38badc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:49:30 +00:00
TreeHugger Robot
70cdd5c5b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: I1d7afd78b111c3fa396339a430c6e2daf6d40140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:49:12 +00:00
Bill Yi
8a85b26086
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: I0ec8e5a382eb8887ee7fedc3acfe14d8e21e6158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:49:05 +00:00
Joshua Mccloskey
0f27b0ab5c
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 3dd64a3e25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: I873d0537d902ac0ed9c5b8d6fa03f51e11fbebf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:42:35 +00:00
Joshua Mccloskey
569a8b4073
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 7747c3b5dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Ic4fd9c1126a818bb40ef9b33a1e95ec2eafbe35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:42:26 +00:00
Joshua Mccloskey
c665d436d6
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 7747c3b5dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Ifd73e88826de5765f1a6e277716966c05d82feb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:42:05 +00:00
Joshua Mccloskey
f9120f7b65
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 63074bf020
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: If69d5a84bbd6e1e5d00756fa608231d3fca8dbc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:41:43 +00:00
TreeHugger Robot
c705beea0d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-01 19:23:59 +00:00
Joshua Mccloskey
7747c3b5dd
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: If6c7958e49bb3b3a7c931ad8cd5a8c8bf0b9dde4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 18:54:44 +00:00
Joshua Mccloskey
63074bf020
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: I62f4a5a26df327ffa753c81465e5b45d738e7b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 18:53:43 +00:00
Joshua Mccloskey
3dd64a3e25
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Icd03348aae7c7f2814a4b00244016caaf8f6bbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 18:53:17 +00:00
Joshua Mccloskey
14a5aded8f
Merge "Ensure lottie animations are not empty." into tm-dev
2022-06-01 18:02:39 +00:00
Vadim Caen
ce4990aed9
Add Settings for back animation developer option
...
Bug: 228936326
Test: BackAnimationPreferenceController
Change-Id: I48516c1f68de799473eac99d35a086046d7e6de9
2022-06-01 16:50:52 +00:00
PETER LIANG
384bc85ecf
Merge "Fix the preview section incorrectly ordered of the display size and text."
2022-06-01 15:34:07 +00:00
Bill Yi
49bdc627d7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a571f069ee
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693627
Change-Id: Ia3d2bbdef2087377b07d6c43e15951c2312001d9
2022-06-01 14:34:24 +00:00
Bill Yi
6852c0b99a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac0cd8d7ff
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18692576
Change-Id: Icac5b1704a653e567f00598d44e571bef2215ee8
2022-06-01 14:33:58 +00:00
Chaohui Wang
b16c17d9c2
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19 am: 01e5be6e2a am: bfa9c894a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: Ibbd871b3819dede132b3f5dc49f5cc356681b30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:41:40 +00:00
Chaohui Wang
99d6654e26
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c308cad5c4 am: 0480f2f311 am: 22efb599ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: If742859be5a7427bbab3cea99afeb319e2018896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:41:32 +00:00
Chaohui Wang
bf6a182e98
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19 am: c47291950d am: 6c090486a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I65e576feb006b453092d3d3409c986c7d868af06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:41:17 +00:00
Chaohui Wang
bfa9c894a7
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19 am: 01e5be6e2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I168865dfd4506ad866bbf2b382fcc4049b29cd1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:24:23 +00:00
Chaohui Wang
22efb599ce
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c308cad5c4 am: 0480f2f311
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: Ic641223dc490cf426769c9faadc6c9c59731abed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:24:15 +00:00
Chaohui Wang
6c090486a0
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19 am: c47291950d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I4d3edbf2d143de3bd7f37203438542389b72fb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:24:00 +00:00
Chaohui Wang
01e5be6e2a
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I4511c3d9357a37aee517b6431e4d0134b0273c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:03:00 +00:00
Chaohui Wang
c47291950d
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I9d987aa0747b3b5079a64623ee187a0398a4e84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:02:56 +00:00
Chaohui Wang
0480f2f311
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c308cad5c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: If9f224daecaa5a10d250656880f68bab30b8f537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:02:51 +00:00
Chaohui Wang
a08a6e964c
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c8218514f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I803a98c15edc57a6ab9626c013a378004eef09e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:02:48 +00:00
Chaohui Wang
7c74b9ba19
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I493a08683c8f5ae0998f04fdcb987aead4d3fe5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:39:08 +00:00
Chaohui Wang
c8218514f2
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I19ed2d32594c8c61733cc033fb38c6fd3b9629ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:38:12 +00:00
Chaohui Wang
c308cad5c4
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I2b28f1f5052b553accc273ac356bd47ea832e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:37:45 +00:00
Chaohui Wang
9ada0accef
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev
2022-06-01 12:24:24 +00:00
Lin Yuan
78799a550a
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: https://screenshot.googleplex.com/AqvEW2kTrQT2Ufp
Bug: 228315522
Bug: 228315529
Test: manually on sunfish flashed with rvc.
Change-Id: I6ef64a34764e52de7b461e87ea0af40a6d050587
2022-06-01 07:17:47 -04:00
Lin Yuan
a12fff673b
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: http://shortn/_EUOdqrOcnS , http://shortn/_j320QDm1Zo
Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device
Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58 )
2022-06-01 10:53:49 +00:00
Bill Yi
a3d586794b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5c20332cf35d47975bb187aa64db2045acaebd3
2022-06-01 03:47:38 -07:00
Bill Yi
3466df0415
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c0c9eb87ae757d27c2917878e21cb2a7b3bc217
2022-06-01 03:43:59 -07:00
Chaohui Wang
bb5b51e44c
Clean up unused string resource sync_plug
...
This one is added by commit 43c697854c ,
but not find any usage.
Bug: 234570979
Test: make Settings
Change-Id: I3941efb0e5e93ceaa5f0fb2ffe96567992d673fb
2022-06-01 18:43:10 +08:00
Presubmit Automerger Backend
b7ebd6e3a3
[automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Bug: 228315522
Bug: 228315529
Change-Id: I8a81fa13e357a7c32a1dde49e0e14fab176ad0fb
2022-06-01 10:37:14 +00:00
Lin Yuan
2598a722ae
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: http://shortn/_EUOdqrOcnS , http://shortn/_j320QDm1Zo
Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device
Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58 )
2022-06-01 10:37:04 +00:00
Rhed Jao
d6804cbff5
Merge "[Settings] Passing correct user id to getAppOpPermissionPackages"
2022-06-01 09:45:06 +00:00
Peter_Liang
4b13620457
Fix the preview section incorrectly ordered of the display size and text.
...
Goals: Set correct order into.
Fix: 233924113
Test: manual test
Change-Id: I88c65aa9c3f05281a5c5090c2ca9503327bb580f
2022-06-01 08:17:56 +00:00
Bill Yi
27b8da05a5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I943e532abeae5541776acb164064bc5305a0bb95
2022-06-01 00:19:28 -07:00
Bill Yi
95fe5f3db6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9906159e1ae0cc46294cecab5ee78a9f168e7bf0
2022-06-01 00:15:46 -07:00