Avinash Vadlamudi
1b7e411315
Rename method for better readability
...
- Rename encircle to encircleUserIcon for proper readability
Bug: 231592331
Test: build, manual check
Change-Id: If9e829372834d8a5f43e4cce358e8c0975fa30eb
2022-06-03 10:22:31 +00:00
Avinash Vadlamudi
618fd19f28
Merge "Fix the Ephemeral guest mode UI bugs"
2022-06-03 02:44:34 +00:00
Muralidhar Reddy Mule
9d83f8d8cf
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
am: 8d9c7445a8
am: 5e1da1db62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: I78d9154908e24f1c15c8bb9a15989dab0abea4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:41:09 +00:00
Muralidhar Reddy Mule
5e1da1db62
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
am: 8d9c7445a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: I7e045c9ad7d98430397a7db09ae8439e3e24f016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:15:50 +00:00
Muralidhar Reddy Mule
8d9c7445a8
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: Ie6673d39e96342de744f7ffad2bf3f49b8ff1805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:02:19 +00:00
Muralidhar Reddy Mule
77381e7e35
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev
2022-06-02 16:40:16 +00:00
Avinash Vadlamudi
9cf1d188a2
Fix the Ephemeral guest mode UI bugs
...
- Update the user-icon size to 40dp to align with add-icon size
- Remove the guestInfo preference and add the infoText as the summary for the guestExit preference and fix UserSettingsTest
Bug: 231592331
Test: Manual test, atest SettingsRoboTests
Change-Id: I2591bc19a7b2381d1842f0b28ab8fa19c15c19b8
2022-06-02 15:38:46 +00:00
TreeHugger Robot
886cf58541
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
am: b2a6f3b640
am: e6ee0ba1ca
am: 1ef5a1c86a
am: 3ff3ace823
am: e4a5991f5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I3e7a06ff3fe933106ec3396f938a235370e07dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 12:23:13 +00:00
TreeHugger Robot
e4a5991f5e
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
am: b2a6f3b640
am: e6ee0ba1ca
am: 1ef5a1c86a
am: 3ff3ace823
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I576c7d7e3d4b3c86e9f92838822d5ddda50bacf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:59:52 +00:00
TreeHugger Robot
6747d28f7d
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
am: b2a6f3b640
am: e6ee0ba1ca
am: 1ef5a1c86a
am: d7fcc775e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I917c425aba5ab872b525cb93519599d42afa34d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:59:22 +00:00
TreeHugger Robot
3ff3ace823
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
am: b2a6f3b640
am: e6ee0ba1ca
am: 1ef5a1c86a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I6bad482c52f4111d402d052db2261ed895b273b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:36:07 +00:00
TreeHugger Robot
1ef5a1c86a
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
am: b2a6f3b640
am: e6ee0ba1ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Idd1b1e42bacbb74d950d9aa9a367b0f3a9fe176c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:18:16 +00:00
TreeHugger Robot
e6ee0ba1ca
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
am: b2a6f3b640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I38e251a90df0d85b02e4a90e60434374caebb43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 10:56:20 +00:00
TreeHugger Robot
b2a6f3b640
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Iea8346aa727c8ca1b9ccf7511e4c360c559c94c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:40:00 +00:00
TreeHugger Robot
2e68c87afc
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I8d59841265494fc6b1e1b280c6c275c4103959be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:13:52 +00:00
TreeHugger Robot
165c11c0da
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I808a8ab16e700325ec93b028e22a58215fbdbbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:58:27 +00:00
TreeHugger Robot
6fd7cf1993
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I6c7835e9885cf02ba167a8f4ac1c564bad511e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:34:09 +00:00
TreeHugger Robot
e3bbadb7df
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Ia3a38063419fccfc6e1be8135180a3a433ebbd23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:15:36 +00:00
TreeHugger Robot
2f184b0ff4
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev
2022-06-02 06:52:53 +00:00
TreeHugger Robot
3f205a646e
Merge "Add Settings for back animation developer option"
2022-06-02 05:13:31 +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
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
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
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
9ada0accef
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev
2022-06-01 12:24:24 +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
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
7cebd7959d
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 596644171b
am: f34bac0ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I2d90540595b155fd0299725334c6179c6dc2d2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:29:13 +00:00
Chaohui Wang
f34bac0ee6
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: I70b1572efb652df90ddaaa633e34cc8fad0e543b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:06:41 +00:00
Chaohui Wang
2416be0c66
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 57e99642e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: Ib8c22696072a50a8c7926a5625e49f0a967574f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:06:21 +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
71fe20ea8b
Merge "Fix flicker in Dark theme" into tm-dev
2022-06-01 02:35:51 +00:00
TreeHugger Robot
dfcef8896f
Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e
am: 28b3a9a7ae
am: ace4d8944c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304
Change-Id: Ib3413537b6b069964e134f3825b235a0df3ff391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 23:33:24 +00:00
TreeHugger Robot
ace4d8944c
Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e
am: 28b3a9a7ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304
Change-Id: I016d7fefa06a535a5edff5670a7c847fa86abacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 23:07:57 +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
ecfb8ca300
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: Ifa8ecedac0cd5918c06a29327685dd3cf5ad8b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 22:54:28 +00:00
TreeHugger Robot
715ffb6f0e
Merge "Update biometrics OWNERS" into tm-d1-dev
2022-05-31 22:34:46 +00:00
Lin Yuan
1e71471b2c
Merge "Fix: policy enforcement for location wifi scanning"
2022-05-31 13:42:13 +00:00
Amith Yamasani
bb2e561062
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
am: 390236115a
am: 6a4d79541a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: I23449db027d5c663cb3dfe7a76211e0e92f87d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 13:00:44 +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
6a4d79541a
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: If31bb0c8c6927bd7eb7f0898d9afdf84af6b6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:39:59 +00:00
Amith Yamasani
d29969dc59
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
am: faa28109f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: I670440d0d88c3deac0e080b1d78408d5ba3b25cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:39:30 +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
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
Rhed Jao
bd2bcd5cca
[Settings] Passing correct user id to getAppOpPermissionPackages
...
A new user id parameter is added to the
IPackageManager#getAppOpPermissionPackages API. Update the new api
usage to the Settings application.
Bug: 229684723
Test: atest SettingsUnitTests
Test: m -j RunSettingsRoboTests \
ROBOTEST_FILTER="AlarmsAndRemindersDetailsTest|
AlarmsAndRemindersDetailPreferenceControllerTest"
Change-Id: I8c90f0a57426c669478367004571cca5dfb05cb6
2022-05-30 14:55:50 +08:00