Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,891 Commits 1 Branch 0 Tags
ae10f49ab832034952ce6c6bcc264765fd5b3c4c
Commit Graph

136891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
cdbe5f350d Clean up unused Lifecycle 
From DataUsageSummaryPreferenceController.

Bug: 295260929
Test: m RunSettingsRoboTests
Change-Id: I4f1d33d7878a80e10aae908df32cff052762fd62
 2023-08-22 14:21:03 +08:00
Treehugger Robot
47c6c86015 Merge "Add Instant hotspot preference" into main 2023-08-22 04:25:10 +00:00
Android Build Coastguard Worker
5736662311 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23982512', 'googleplex-android-review.googlesource.com/24299128'] into udc-release. 
Change-Id: I3c6aafd715a5d10760166537ca5235c925008589
 2023-08-22 02:19:50 +00:00
Eric Biggers
fc5e4e4576 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() 
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
(cherry picked from commit 05f1eff1c9)
(moved change into ChooseLockPassword.java and ChooseLockPattern.java,
 which are merged into SaveAndFinishWorker.java on udc-qpr-dev and main)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8f3ca8daeb583b8d46ad0d1045c2b953b83f5903)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
 2023-08-22 02:15:27 +00:00
Weng Su
b4e4facff4 Restrict ApnEditor settings 
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e18e7414c674a1c5bc69961c03499849b4aefd2)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5a17d39db7af7cea46763bfcdb50380bf0da92e3)
Merged-In: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
 2023-08-22 02:15:17 +00:00
Austin Delgado
e7377fc73c Merge "Fix talkback not announcing requirement in ChooseLock" into udc-qpr-dev am: fdb53691b1 am: 7f18843856 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24502371

Change-Id: I78f52d9f6a248cc9b0bb8461d97a63190a454f7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 23:26:25 +00:00
Austin Delgado
7f18843856 Merge "Fix talkback not announcing requirement in ChooseLock" into udc-qpr-dev am: fdb53691b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24502371

Change-Id: Iaf8dfaf0764bc7d50c462dcfbf2b802fa2f60785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 22:48:04 +00:00
Austin Delgado
fdb53691b1 Merge "Fix talkback not announcing requirement in ChooseLock" into udc-qpr-dev 2023-08-21 22:28:52 +00:00
Austin Delgado
a73cee24d4 Fix talkback not announcing requirement in ChooseLock 
Fix: 281955512
Test: Manual, verify talkback reads out password requirement on 17th digit
Change-Id: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd
Merged-In: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd
 2023-08-21 20:35:39 +00:00
Austin Delgado
5a4105b324 Fix talkback not announcing requirement in ChooseLock 
Fix: 281955512
Test: Manual, verify talkback reads out password requirement on 17th digit
Change-Id: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd
 2023-08-21 13:33:49 -07:00
Treehugger Robot
675445314a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: 113ac8d105 -s ours am: 60576c7278 -s ours am: cb61bf5909 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e145f7083519fde49018684768d7560ca14c954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:29:22 +00:00
Bill Yi
74aa510bd0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: 99073e56cc -s ours am: 3fbec94efd -s ours am: 206a0916b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifa12f6b6c55638d4801e4482d45b48dddee51a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:29:19 +00:00
Treehugger Robot
65e9a2206f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: 113ac8d105 -s ours am: c1a9f3b899 -s ours am: 29e93d4241 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a753c196a1d57fc0997b4b4f458b7a809deab26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:28:05 +00:00
Bill Yi
648c8b8dc4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: 99073e56cc -s ours am: 9627696277 -s ours am: 022231ddfb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6d8cfc75493033b38ed1f2bca8997280719aa7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:28:03 +00:00
Treehugger Robot
66263ddea7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: ced1f0f311 -s ours am: 4b343ece13 -s ours am: 1d562cda45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e377546936512e7af7cefa80cd4ccb6d48f47a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:25:47 +00:00
Bill Yi
b7c331a070 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: bb043fa69a -s ours am: c259f9189b -s ours am: d84e7d955d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8567d7eadd4bdba5629d87e1b7eeafe2ef27200a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:25:42 +00:00
Treehugger Robot
cb61bf5909 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: 113ac8d105 -s ours am: 60576c7278 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2f1cae8125c0e01b7696a9ee3731985219a648b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:21:35 +00:00
Bill Yi
206a0916b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: 99073e56cc -s ours am: 3fbec94efd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa5d28846696851cddebb4374e620dd88c33fd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:21:31 +00:00
Treehugger Robot
29e93d4241 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: 113ac8d105 -s ours am: c1a9f3b899 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcece623d0a3a058f9f12021fcecf8e062e05c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:16:38 +00:00
Bill Yi
022231ddfb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: 99073e56cc -s ours am: 9627696277 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf186a242aba79a0b3ae0fc3d797e9749689529f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 19:16:32 +00:00
Treehugger Robot
c1a9f3b899 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: 113ac8d105 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icec8d0e0f417da0f480689e328c5ea89718217c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:50:09 +00:00
Bill Yi
9627696277 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: 99073e56cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec3486257c3b84741f2260925d86e6dfd338e4b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:50:05 +00:00
Treehugger Robot
1d562cda45 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: ced1f0f311 -s ours am: 4b343ece13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62494fbf49eb5508d90fe21f52687e19115c505d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:45:09 +00:00
Bill Yi
d84e7d955d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: bb043fa69a -s ours am: c259f9189b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3896d92494c875958a3e7298d8364983c72666c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:45:05 +00:00
Treehugger Robot
60576c7278 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: 113ac8d105 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I756267739c15c4c6a4f022fd74c9cc805fc44cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:44:15 +00:00
Bill Yi
3fbec94efd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: 99073e56cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic27c81951e5d36e37571225bdc1071e8dff71c05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:44:11 +00:00
Treehugger Robot
4b343ece13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: ced1f0f311 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3d6b7af6a753a5c1317fb06fe13ca91987be35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:18:54 +00:00
Bill Yi
c259f9189b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: bb043fa69a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28caee0961f5593b64b79ac68572c3ba7e8b16ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:18:52 +00:00
Treehugger Robot
1b3d9dafc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: c34cae32c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f47d69b7e26dc1c64c6bc6706cecbf3f9f88768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:18:12 +00:00
Bill Yi
0232b3f150 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: d6d94306c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84a879c1b6e7fabc8ddb924c43aad71ca6f90cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:18:07 +00:00
Treehugger Robot
113ac8d105 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5180ce7f5bd3564f9e80ce4ef51259526e7f94a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:38:29 +00:00
Bill Yi
99073e56cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaff959abd8c1eadac9f5a570202fb5eee0895ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:38:26 +00:00
Treehugger Robot
c34cae32c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I589a6145adad69b5041f0dddab5f9caa03848fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:36:45 +00:00
Bill Yi
d6d94306c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib573dc85293cb08ca66fa6073885421b124f32e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:36:41 +00:00
Treehugger Robot
ced1f0f311 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfc84ae81d74aa5a5a7358b720d1b7e00740cb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:36:15 +00:00
Bill Yi
bb043fa69a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I403572a913f7a7c5a985bc779a71f816fd47d157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:36:10 +00:00
Vlad Popa
0134421059 Merge "Do not show SA preference for device that do not support it" into main 2023-08-21 16:49:21 +00:00
Treehugger Robot
44e242075a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-08-21 16:43:37 +00:00
Edgar Wang
efebbdd3b2 Update product type of auto_rotate_summary_a11y to fix string on the tablet 
Bug: 295933964
Change-Id: Ibf06e6dcdd080b524d1f44cd6f612a53d5fce300
Test: rebuild
 2023-08-21 16:11:58 +00:00
Weng Su
27b3821313 Add Instant hotspot preference 
- Add Instant hotspot preference to Wi-Fi hotspot settings

- Wait onServiceConnected callback and then getSettingsState

- Use the PendingIntent provided by SharedConnectivitySettingsState to launch Instant hotspot settings

Bug: 268550769
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
         SharedConnectivityRepositoryTest

Merged-In: I343599e6127d9b1cb4af661dcc80a8683589c7b8
Change-Id: I343599e6127d9b1cb4af661dcc80a8683589c7b8
 2023-08-21 12:21:25 +00:00
Treehugger Robot
e10d0237c2 Merge "Use Mockito Kotlin" into main 2023-08-21 11:26:14 +00:00
Weng Su
63321a1a83 Add Instant hotspot preference 
- Add Instant hotspot preference to Wi-Fi hotspot settings

- Wait onServiceConnected callback and then getSettingsState

- Use the PendingIntent provided by SharedConnectivitySettingsState to launch Instant hotspot settings

Bug: 268550769
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
         SharedConnectivityRepositoryTest

Change-Id: I343599e6127d9b1cb4af661dcc80a8683589c7b8
 2023-08-21 11:14:04 +00:00
Zaiyue Xue
9f57691d89 Add UI metrics logging for battery tips card. 
Bug: 291689623
Test: manual
Change-Id: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
Merged-In: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
 2023-08-21 17:40:28 +08:00
Treehugger Robot
8cfb640bf3 Merge "Add UI metrics logging for battery tips card." into main 2023-08-21 09:21:49 +00:00
Chaohui Wang
8647256269 Use Mockito Kotlin 
Which has better support for Kotlin unit test.

Bug: 289155281
Test: unit test
Change-Id: Ic98ba7e66c124e8398ad01d3bca7ee3a771b06c4
 2023-08-21 17:01:52 +08:00
Zaiyue Xue
f838f5d5fa Add UI metrics logging for battery tips card. 
Bug: 291689623
Test: manual
Change-Id: I925e4d887c3435239aed0aa0fde7cda2c3a95b3c
 2023-08-21 08:12:03 +00:00
Chaohui Wang
4957e2d000 Merge "Clean up unused fields from EntityHeaderController" into main 2023-08-21 07:47:09 +00:00
Chaohui Wang
cc2133ba8e Clean up unused fields from EntityHeaderController 
Bug: 295260929
Test: manual - on pages with header
Test: robo test
Change-Id: Icebd63dbb5d3d44b4b46d3bececb8b65b30b4883
 2023-08-21 13:58:07 +08:00
Charlotte Lu
a796508aa2 Merge "Java crash - AID_SYSTEM_USER - SimListDialogFragment.updateDialog - java.lang.NullPointerException." into main 2023-08-21 02:19:15 +00:00
Angela Wang
6bb80b42bf Merge "Fix flash notification preview not working for second user issue" into main 2023-08-19 08:38:38 +00:00