Arc Wang
d94b73b304
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:52:17 +08:00
Arc Wang
973a46134b
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:51:42 +08:00
Arc Wang
e3134c4a04
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:51:05 +08:00
Arc Wang
73985c8296
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:49:30 +08:00
Arc Wang
67b9fb57ea
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:48:26 +08:00
TreeHugger Robot
d3fa68ae4c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7
-s ours am: 34534c87b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: I22a44858160dfad39cd1d2d08a446d7dfb752d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 00:16:23 +00:00
Bill Yi
62df895260
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b
-s ours am: 95fef514c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: Ia094859f349e3f892798c3e6b6a1fa1b369b5b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 00:16:04 +00:00
TreeHugger Robot
34534c87b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: I1b8c9672581e4ee6fbf0533626d25f702a5c8e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 23:51:01 +00:00
Bill Yi
95fef514c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: I1a14edab2cb0cc8d0878cc0a0195db8b8ae816c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 23:50:35 +00:00
TreeHugger Robot
9d995e75a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-01 23:22:20 +00:00
Bill Yi
3c0f379808
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415
-s ours am: 6620ba750b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696259
Change-Id: I0534b3748f0a99697af81088d8cb32843865d8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 23:04:11 +00:00
Bill Yi
6620ba750b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696259
Change-Id: I30af08bada2f825641e1dc015b753bd242b63315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 22:40:56 +00:00
Raphael Kim
8d749c55f4
Extract app label from component name in notification access confirmation UI
...
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
Merged-In: I8613d9b87a53d4641c0689bca9c961c66a2e9415
2022-06-01 22:24:39 +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
c705beea0d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-01 19:23:59 +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
14a5aded8f
Merge "Ensure lottie animations are not empty." into tm-dev
2022-06-01 18:02:39 +00:00
TreeHugger Robot
a3be04c95d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-06-01 17:51:21 +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
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
a31031e5bb
[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: I704dc294544543108bd9ba1fc4a10eb3e99e5d4a
2022-06-01 10:37:14 +00: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
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
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
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
87a8b49ca0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I57f1a9aab938cdc0e363e835460ccffbf79d97d6
2022-05-31 23:52:36 -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
Bill Yi
3dea4314ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifd21d97003c44e3e95ed191fd691e0a8e2042092
2022-05-31 23:47:37 -07:00
Chaohui Wang
57e99642e6
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: I111f39e1f41413f3ab5e73e51bda2694c7aebbc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 02:50:46 +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
Raphael Kim
c548f102e5
Extract app label from component name in notification access confirmation UI
...
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
Merged-In: I8613d9b87a53d4641c0689bca9c961c66a2e9415
2022-05-31 17:21:36 +00:00
Amith Yamasani
faa28109f2
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: I451b1cddcedf6a2f5daa95d3a1426e7f6ea56a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:24:06 +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
Edgar Wang
66c9a88946
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: I28df0c9ebe36df58bb5127c84943e00cc553f453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 04:35:29 +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
8c6cb5b92f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-05-29 07:46:43 +00:00
TreeHugger Robot
2d8d8604cf
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-05-29 07:46:43 +00:00
TreeHugger Robot
9a9de52dbb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I55f7c9c2dde221d6d9d472f24c897919e1b21a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 22:40:29 +00:00
Bill Yi
a21e6047d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I1f98aca0e386896c18cd8f74ce51b4358c6f1b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 22:40:24 +00:00