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
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
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
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
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
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
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
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
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
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
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
4a398405a2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f567279aeb9988c80aa4307da54c62823b2682b
2022-06-01 00:01:36 -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
cb66a7b88a
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: f1487a7661
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: Ib9c41d951f5e3e4330a1cb616dc2f6ffdccfae8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:07:02 +00:00
Chaohui Wang
f519eb1c05
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 596644171b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: Ia5dbd8fa8e67fce3b8d20f6cedbb983e65650650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:06:41 +00:00
Chaohui Wang
596644171b
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I9c4aed2bb375a2b8b7836a139b1b01f64d235dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 02:51:43 +00:00
Chaohui Wang
f1487a7661
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I649d3486aa2228af4d68dc1a80b414fe36510c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 02:50:22 +00:00
Chaohui Wang
71fe20ea8b
Merge "Fix flicker in Dark theme" into tm-dev
2022-06-01 02:35:51 +00:00
Lin Yuan
9eff8f7a8d
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/49nR5HQ8g5bgNVq
Bug: 228315522
Bug: 228315529
Test: on device
Change-Id: I92b22567011c32f0874bcecb3898ef678bb549a1
2022-05-31 21:51:40 -04:00
Joshua McCloskey
68f6089745
Ensure lottie animations are not empty.
...
Test: Verified device doesn't crash in AOSP when lottie
animations are empty.
Bug: 228284341
Change-Id: If39096b3169c4956cb7f3ec66c4df58e41c66e86
2022-06-01 01:01:12 +00:00
Lin Yuan
c877dce583
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-05-31 23:00:32 +00:00
TreeHugger Robot
28b3a9a7ae
Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304
Change-Id: I9e12101cb0fd246ec5dde24754f298173a1fda80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 22:54:33 +00:00
TreeHugger Robot
715ffb6f0e
Merge "Update biometrics OWNERS" into tm-d1-dev
2022-05-31 22:34:46 +00:00
Amith Yamasani
2294b09650
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
am: b9e7df683f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: I535eda21a8445deb256a145170ae42ae1a3115ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:40:10 +00:00
Amith Yamasani
6cbe791c94
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
am: 390236115a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: I31e002c94128935ef811033da62b831299925df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:40:00 +00:00
Amith Yamasani
390236115a
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: I69c616bb66f0a440e654fe8c324bd222d1b3e612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:25:01 +00:00
Amith Yamasani
b9e7df683f
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: I169d16a6dbb7cec8a82386ebd7f482845d2f0836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:23:43 +00:00
Chaohui Wang
9f6eaf8624
Fix flicker in Dark theme
...
Currently, when schedule sets to "Turns on at bedtime", the footer will
show a slid up animation when entering the page, this is because the
"Start time" & "End time" preferences are hidden in onResume().
This is because these 2 preferences always return AVAILABLE in
getAvailabilityStatus(), and manually update visibility in
refreshSummary(), which is called each time updateState() is called.
Usually the controller not set the visibility explicitly, but return
CONDITIONALLY_UNAVAILABLE in getAvailabilityStatus() when they want to
hide the preference.
Because getAvailabilityStatus() is called in onCreate(), by using this,
we can fix the flicker.
Fix: 234399017
Test: visual & robo test
Change-Id: I4cb7dd95d2985bd1ca4c8cb30aaebdc21a5415f8
2022-05-31 19:03:54 +08:00
Chaohui Wang
75e4028b3e
Clean up DarkUIInfoDialogFragment
...
The usage of this dialog is removed in
Change Ie2cf147de53385ae0c626c8472306f1b85317686
But this dialog is created (but not show) in DarkUIPreferenceController
each time dark mode toggle is turned on by user.
So clean this up.
Fix: 234419979
Test: make Settings
Change-Id: Icdc9d7a4fb77dc8b2a3f1a9d8e3f40fc0af4917d
2022-05-31 17:58:05 +08:00
Amith Yamasani
1b27c91a7b
Use Uri.toString() instead of Uri.toSafeString()
...
Uri.toSafeString strips out paths and shouldn't be used
for situations other than logging.
Bug: 232694281
Test: PtsPowerTestCases
Change-Id: Iec835b738c3e928e922bd6a14573106f2ce4f526
2022-05-30 23:22:25 -07:00
Zoey Chen
ad2bdc8fef
[automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
am: bd8c589390
-s ours am: 95c15f1f0b
-s ours
...
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987
Change-Id: I3696416d7a05fc2cd6d7c3d3fe4018131388f5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 04:37:04 +00:00
Zoey Chen
95c15f1f0b
[automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
am: bd8c589390
-s ours
...
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987
Change-Id: I25e081bb87845b2b286326eaad7f53573eb9e441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 04:22:36 +00:00
Zoey Chen
bd8c589390
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987
Change-Id: Iee27c40089c612cd2e9ac80a4fa218d707fffd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 03:57:00 +00:00
Zoey Chen
31011d591f
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings"
2022-05-31 03:27:51 +00:00
Automerger Merge Worker
2773af62b8
Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
am: 7e712ef660" into tm-d1-dev-plus-aosp
2022-05-30 05:05:51 +00:00
Edgar Wang
67e1606b5e
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
am: 1767504702
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: I1dd67111c2d18b8f41a318860ee751a3f6ec6aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 05:05:31 +00:00
Edgar Wang
e735b97709
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
am: 7e712ef660
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: Iec98afd8781aa28bb0d15a66382f0f9c1d8d9028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 05:05:31 +00:00
Edgar Wang
1767504702
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: I584713ed38df60ecb9742f79f5cbc2e0c2ea90bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 04:36:10 +00:00
Edgar Wang
7e712ef660
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: I1e600321182b83edebe65bbc932222b4ea7bc4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 04:34:50 +00:00
Edgar Wang
610538e10b
Merge "Enable hyphenation on most of preference." into tm-dev
2022-05-30 04:00:19 +00:00
Treehugger Robot
7cf2c08b53
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
am: 2341b91f32
am: 22c4b4009b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I68e18d34ee0f28caac1da18f76472082eb524430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 03:59:47 +00:00