PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,268 Commits 1 Branch 0 Tags
3095174a6fd21efcdd8b51ac15efc00599d1497b
Commit Graph

131268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Cheng
3095174a6f [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours am: 60f4e180a2 -s ours am: 39f518b258 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I770c48cda1a84c0ce2775a351befa8fa9b74c988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:56:11 +00:00
Matías Hernández
2e7431d6cd Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217 am: 63a50999f5 am: f03e08c644 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I4eca96495323d0c713836823acd5d80ce6256c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:54:51 +00:00
Matías Hernández
728291e33e Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: 9feb898da7 am: bb3122ca29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I18386b9eeb9abbd97df605b5057de591872f8213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:53:28 +00:00
Matías Hernández
bc7844a313 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: e20f52a05a am: 281c4b631c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: Ib6b25e65790ec023e63b5b2400762de51ee76065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:50:08 +00:00
Grace Cheng
39f518b258 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours am: 60f4e180a2 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I730dab9c7076a3abbae467fbb30b3d9cd0298f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:45:11 +00:00
Matías Hernández
f03e08c644 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217 am: 63a50999f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: Ice022fe659e4a48ee5ae79c16f8b950479ad2b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:44:09 +00:00
Matías Hernández
bb3122ca29 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: 9feb898da7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I029027019505a86fbf88ad4a127d6f0ffa11ce79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:41:36 +00:00
Grace Cheng
dc3404939c [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: add8f5cda2 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 f58714496a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I2cd78c810b1cbe4f3f8f43370e6d64b460446cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:00:07 +00:00
Grace Cheng
694569f60c [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: 279e4c77f0 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: Icf5eabcdc24d83a3728768d47fb5b29c3da2ce9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:59:26 +00:00
Matías Hernández
281c4b631c Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: e20f52a05a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I2bcd0934af1e0e4d6679e04293f04bbebcadab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:44:07 +00:00
Grace Cheng
60f4e180a2 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I6581685284601d4ee82c4585a922092c17e12856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:41:14 +00:00
Grace Cheng
279e4c77f0 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I4d1d06bcff647eec3e10fa99636f301563e05ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:40:35 +00:00
Matías Hernández
63a50999f5 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I66d6a9ce28f475dfb2d130bcaccdc3d2c6b8623d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:39:45 +00:00
Matías Hernández
e20f52a05a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I8fc3a7b239ce0545b34eafc860df72a42cfd2e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:39:16 +00:00
Grace Cheng
add8f5cda2 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: Icaadc6f5a6c0711bf4122706363c82753a93869c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:39:15 +00:00
Grace Cheng
f73f073643 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:36:58 +00:00
Automerger Merge Worker
21eb1a3802 Merge "Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 57739acf63" 2023-06-28 18:36:21 +00:00
Matías Hernández
412fc3e2c4 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 143d105dc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I71f428e90b132c4282827b698623ee1d43c0f7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:35:53 +00:00
Matías Hernández
9feb898da7 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:35:52 +00:00
Matías Hernández
961f0e20d5 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 57739acf63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I45c41e5eb54b73355427497748de259f00543d7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:35:40 +00:00
Grace Cheng
25b489e212 Merge "Fix NPE in updateAddPreference" into udc-dev 2023-06-28 17:41:13 +00:00
Matías Hernández
143d105dc9 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I4ab7053bffc4268cf1d0d2be5e7dbec5ba5f65d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 17:15:07 +00:00
Matías Hernández
aaddfd88e9 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 17:14:55 +00:00
Matías Hernández
57739acf63 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I4d187c9a398bf713519c8cc2c335ab1d2c2bd645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 17:14:40 +00:00
Matías Hernández
0d21526217 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I1e1dbbdf2b1834da763835c1bbcd263cdb27eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 17:10:34 +00:00
Matías Hernández
4d34eb2c7a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev 2023-06-28 16:42:13 +00:00
Treehugger Robot
396653e8f3 Merge "[BiometricsV2] Fix intro overlap enrolling page" 2023-06-28 13:43:32 +00:00
Milton Wu
570b23e0a0 [BiometricsV2] Fix intro overlap enrolling page 
Fix fragment overlapped if user rotates device on findSensor page, then
enter enrolling page and back again.

It is because the flag isFirstFragmentAdded is not saved and restored
after activity recreated

Bug: 288212767
Test: atest FingerprintEnrollmentActivityTest
Test: atest FingerprintEnrollmentViewModelTest
Test: atest biometrics-enrollment-test
Test: Manually test this scenario
Change-Id: I5b582582d97caac2488b787f551c50abec9f810c
 2023-06-28 13:28:44 +08:00
Yanting Yang
a09fd45249 Merge "Support the about device warning message for tablets" 2023-06-28 03:57:08 +00:00
Yanting Yang
0818b82ecf Support the about device warning message for tablets 
Move the related strings to res-product folder and add the string for
tablet.

Bug: 282233849
Test: visual
Change-Id: Ib93fd1a3e15600bd2278297645dadd176d99a083
 2023-06-28 02:28:34 +00:00
Treehugger Robot
4dd2e56ddf Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev am: 6b01e66545 am: fac986e071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783056

Change-Id: I31ce5d4e828d51c0d73711e3615ea1515edc30d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 18:55:55 +00:00
Treehugger Robot
fac986e071 Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev am: 6b01e66545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783056

Change-Id: I15eb02f35ba2bad14edd6ef00374216aa8b5b4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 18:07:37 +00:00
Treehugger Robot
6b01e66545 Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev 2023-06-27 17:35:26 +00:00
Kholoud Mohamed
0f61efb2e9 Merge "Migrate the setUsbDataSignalingEnabled api to the device policy engine." 2023-06-27 15:57:25 +00:00
Vania Januar
7936f53f8e Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev am: 0e8bdf2fc0 am: 4c281ab191 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23766165

Change-Id: If809d40cb2f0d5b42892011667f979477167bc52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 15:45:29 +00:00
Zoey Chen
dab8f53e9b [Panlingual] Add metric in Languages 
Bug: 279915462
Test: manual
Change-Id: I12dc7f8a0c594de88790e116c4b4f7ca9dc7253e
 2023-06-27 15:40:36 +00:00
Vania Januar
4c281ab191 Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev am: 0e8bdf2fc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23766165

Change-Id: I5937c756289f04916f366ec0acba6866b422ac50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 15:00:48 +00:00
Vania Januar
0e8bdf2fc0 Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev 2023-06-27 14:14:58 +00:00
Treehugger Robot
ac00ec0b8a Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev am: dd3e338823 am: 650a7e9298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467970

Change-Id: Ib3f2cc4ec57b7d5e613fdf42bb05bb9a4db63fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 09:21:19 +00:00
Edgar Wang
abe00cabad Correct used size of Storage Settings. am: e52320e755 am: 88659e80d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23483884

Change-Id: I34a0e0084c28c0c575ab0081e53e81e8a18f9b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 09:20:29 +00:00
Treehugger Robot
0c021e70b2 Merge "Remove setAssistOnly() from GestureSettings" 2023-06-27 09:09:23 +00:00
Treehugger Robot
4600c0009f Merge "[BiometricsV2] Refactor EnrollingUdfpsFragment" 2023-06-27 09:03:29 +00:00
Treehugger Robot
650a7e9298 Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev am: dd3e338823 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467970

Change-Id: If91f7efe15ef7fffda7a87ab6a8c188ab2a404be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 08:58:05 +00:00
Treehugger Robot
dd3e338823 Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev 2023-06-27 08:46:50 +00:00
Edgar Wang
88659e80d9 Correct used size of Storage Settings. am: e52320e755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23483884

Change-Id: I4816569a8c5bee277121f15397adf7167ec944e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 08:35:31 +00:00
Chaohui Wang
16cb921c47 Remove setAssistOnly() from GestureSettings 
Fix issue that use(AssistGestureSettingsPreferenceController.class)
could be null.

Bug: 287566056
Test: manually - on System > Gestures page
Change-Id: Ifb78a787c34e2fd0e255a6473b8c514f2788f52e
 2023-06-27 16:08:25 +08:00
Xin Li
84351db496 [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -s ours am: bcc898dbed -s ours am: e849e3a643 -s ours am: 7a4625239f -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192

Change-Id: Ic7eec29790f3bf176e23b59e55d261e0a0755f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 08:07:44 +00:00
Xin Li
bea3b18c7c [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -s ours am: 8244a2aeb4 -s ours am: c9bfd995a9 -s ours am: 96633fda9a -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192

Change-Id: I9e4fcaebf613902e54229e5c8523b40703731f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 08:05:59 +00:00
Xin Li
7a4625239f [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -s ours am: bcc898dbed -s ours am: e849e3a643 -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192

Change-Id: I190dc6e845ee9574e822ab9c357ed16282da8aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 07:27:29 +00:00
Xin Li
96633fda9a [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -s ours am: 8244a2aeb4 -s ours am: c9bfd995a9 -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192

Change-Id: I2ddc767f85a91245866149964e541c4313f026f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 07:25:45 +00:00