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
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
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
Bill Yi
7e605531d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I577bf242a12cc6c991af536908032b74cf248c93
2022-06-01 00:12:09 -07:00
Bill Yi
9c19a5eed5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e8038dac412180de51369518035e4e8e65bf7a8
2022-06-01 00:08:12 -07:00
Bill Yi
cecf7e8238
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibef8e16fcc97186a712b11df11cfb7746ac1db54
2022-06-01 00:04:31 -07:00
Bill Yi
4155618946
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I241f921e1795e532985cb970699017eeeffcb426
2022-06-01 00:03:05 -07:00
Bill Yi
4a398405a2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f567279aeb9988c80aa4307da54c62823b2682b
2022-06-01 00:01:36 -07:00
Bill Yi
5834ae74c6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icd4b9382ac241f2e24907cb41cebac38c79eb686
2022-06-01 00:00:11 -07:00
Bill Yi
a571f069ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I64383f65cb3f3a67ddcdd3e98448bc6dc1e2ff8f
2022-05-31 23:56:24 -07:00
Bill Yi
ac0cd8d7ff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0b04b64ce3ab5fde81cafa75be33160ec92074b1
2022-05-31 23:49:03 -07:00
changbetty
a7b89ba24b
[LE Audio] Broadcast Sink UI
...
- Add dialog for Broadcast and find broadcast source
- Add Activity for find broadcast source
Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
Merged-In: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
2022-06-01 06:40:07 +00:00
Muralidhar Reddy
396e2fd7d8
Adding eSIM option is not disabled if the current country is not in the allowed list
...
When both stack 1(pSIM) and stack 2(eSIM) are not available, stack 1 starts for emergency calls only. For eSIM, modem keeps on stopped state due to power consumption concern which is as per DSDS design.
Modified the logic to not call platform API if the countryCode is empty.
Bug: 231952356
Test: 1) Manually verified on C10P10 and Pixel 4a Device and eSIM option is enabled.
2) Modified not allowed country list and verified the eSIM option is disabled.
Change-Id: I99750f80fb2e2e180950b743ecbbbcb7a912528f
2022-06-01 04:58:05 +00:00
Chaohui Wang
777595cc82
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: f1487a7661
am: cb66a7b88a
am: d0392c974c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: If6766659a1141fb8619775775f2054bd3ad218c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:54:54 +00:00
Chaohui Wang
bcf3a5768e
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 596644171b
am: f519eb1c05
am: 2e167ee500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I53e6614e4ab0cd3df6ac317bdad307676a96a876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:54:31 +00:00