Commit Graph

128051 Commits

Author SHA1 Message Date
Bill Yi
b5fcedb941 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb -s ours am: 3e25353a21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id17148d318d09dcaa0b77104651948a1cc46e6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 01:17:13 +00:00
Bill Yi
6145b47ddb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb -s ours am: b5d9af927d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I918221453e8f08724511185cf4028df1befe7758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:56:44 +00:00
Bill Yi
b5d9af927d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13cf5ec73c081b0edfa01b2bcfd46b8b87dda63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:38:12 +00:00
Bill Yi
3e25353a21 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic96fddd3151d389e8871be0dd3ec46df6ee9392f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:37:45 +00:00
Eric Biggers
50f93771bc 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().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1c9)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
2023-08-02 23:45:19 +00:00
Eric Biggers
99be30f895 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().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(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)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
2023-08-02 23:43:41 +00:00
Eric Biggers
6e92ca106e 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().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(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)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
2023-08-02 23:43:23 +00:00
Eric Biggers
e0b5a793a1 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().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(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)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
2023-08-02 23:43:10 +00:00
Eric Biggers
423c0e0d47 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().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(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)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
2023-08-02 23:42:52 +00:00
Bill Yi
6a05d24aeb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0203970ca5ae0cd875997a601a8f66cf96de39f1
2023-08-02 14:57:40 -07:00
Justin McClain
2469a9c0cc Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 am: 63256b458d am: 6d5ae56ab7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I906643a9b4c923f8c6268eb52326f066e8d0f155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 21:13:54 +00:00
Justin McClain
6d5ae56ab7 Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 am: 63256b458d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I3d616f015890d6ec77efc2558aa780553424dcfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 20:30:49 +00:00
Justin McClain
63256b458d Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I9ae167fda396f42065c30c680bdc66806a02f342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 19:22:29 +00:00
Justin McClain
01dbc55db8 Merge "Adding owners file." into main am: 3bf19b75fb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I2f3b523f8ac1988ba51a9cc77b5868ff8f9e0ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:19:22 +00:00
Justin McClain
3bf19b75fb Merge "Adding owners file." into main 2023-08-02 17:10:52 +00:00
Zoey Chen
1688c57226 [Regional Preference] Add description for checked/not checked
Bug: 288223637
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I0d1a2de93ad2911c555acef2f4e00cd715c62f17
Merged-In: I0d1a2de93ad2911c555acef2f4e00cd715c62f17
2023-08-02 13:18:42 +00:00
YK Hung
42f0193b4b Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev am: 270b7ef18d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24124246

Change-Id: I657cab61453b5f7708fcf305d1a9611d3022c4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:26:29 +00:00
Treehugger Robot
5058935211 Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935

Change-Id: Icda113c650b9544ae8218436fdd0a511f76d2aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:23:14 +00:00
YK Hung
5964c972fa Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476

Change-Id: I658e16b80d85c9e7022d57e8f960f11d5e5cd6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:21:53 +00:00
YK Hung
270b7ef18d Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev 2023-08-02 03:30:08 +00:00
Treehugger Robot
103adb753a Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev 2023-08-02 03:26:19 +00:00
YK Hung
1b43697eb8 Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev 2023-08-02 03:23:11 +00:00
ykhung
69f46a72fc Update the incompatible charging banner tip icon
Update the incompatible banner tip icon based on the UX update:
https://screenshot.googleplex.com/8ApTNJnsxRRufjQ

Fix: 246960554
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I060554c17b3825b38004fb643c0a0cdf5fdbed4d
2023-08-02 02:05:15 +00:00
Austin Delgado
e4dc0e3762 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28 am: 35579efcaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: Idb488912e4e85fbcc3f80472eb09e8ba06272500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 23:47:45 +00:00
Austin Delgado
2f1b844997 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28 am: 0abddc88bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I0d3fcbf3af5b717b76b9b07974b687ba770d89db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 23:47:08 +00:00
Austin Delgado
35579efcaf Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I5ffe93b5c0fe5a52ad841e5e5942363cf0a0d6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 23:06:10 +00:00
Austin Delgado
0abddc88bc Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I706d8f22283ead587622a6d0fd4907a7b9e93f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 23:05:19 +00:00
Austin Delgado
c6e7b93f28 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev 2023-08-01 22:13:34 +00:00
Wenhui Yang
cf8ba456bb Add bp subtitle for WiFi sharing
Move the screen lock message selection logic to Utils and update the
related strings as suzannechen@ suggested.

Test: manual (see bug)
Test: atest UtilsTest
Fixes: 291307701
Change-Id: I346c25426395eea1320edc07ce2d962efeb8daa6
2023-08-01 21:11:33 +00:00
Bill Yi
7c0701c22d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours am: 50d506b8b5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42dce3063ce163cf46588be791e3f76fa856cc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:25:46 +00:00
Bill Yi
c538b011d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours am: 6e91516467 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I505508c012be9e45fdbb3eb7d56ab920433de749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:12:27 +00:00
Bill Yi
6e91516467 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c7d3c5a75c697097736fa5108c8736c22b232eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:46:09 +00:00
Bill Yi
50d506b8b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd9e4654e4bf946678c125de4ee2163e3cd6b4df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:42:47 +00:00
Oli Thompson
ea18752f4a Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev am: 04854b1c65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23782668

Change-Id: I7ba3169002b1d7f7c010ca078d7a723b86788dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:17:00 +00:00
Oli Thompson
04854b1c65 Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev 2023-08-01 16:31:03 +00:00
Justin McClain
5f8aeeb9ef Adding owners file.
Test: m
Change-Id: I0b32a9bc0e9be65b3d2ff0ac07d79baa05305205
2023-08-01 13:44:22 +00:00
SongFerng Wang
b93774ab40 Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278

Change-Id: I017d432a9abe3f141436f185c156838b393d3d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 11:39:35 +00:00
SongFerng Wang
b2c60799af Merge "Fix testcase failed" into udc-qpr-dev 2023-08-01 10:55:39 +00:00
mxyyiyi
be8407c566 Implement the battery tips cards.(1/2)
- Implement a tips card UI in Battery Usage.

[Screenshot]:
- Tips Card with thumbs-up/down feedback in dark mode
https://screenshot.googleplex.com/3nRCFYvLTWfiYYT
- Tips Card without feedback
https://screenshot.googleplex.com/B7QGRJZAHzgWpCP
- Tips Card in Force RTL layout
https://screenshot.googleplex.com/8crQdj8ao26pKpH
- Tips Card in light mode
https://screenshot.googleplex.com/885aVvZm8xmhK2S

[TODO]:
- Add accessibility
- Localization

Bug: 291689623
Test: Manual
Change-Id: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
Merged-In: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
2023-08-01 09:49:19 +00:00
Kuan Wang
64177774e2 Add cache strategy for getUsageSource().
Cache usage source into SharedPreferences when phone is booting to avoid
calling it too frequently.
It should be safe because the usage source can only change on reboot.

Bug: 293366011
Test: make RunSettingsRoboTests
Change-Id: I35c07539d294737c5764b03b746cfb39f4ce008d
2023-08-01 14:36:58 +08:00
Austin Delgado
035b661ea4 Announce requirements when setting PIN/Pass
Test: Manual, verify requirement is read
Fixes: 281955512
Change-Id: I6d963d545c68c4ec891d9ad8a7da8c0a0f6e9d6b
2023-07-31 17:50:39 -07:00
Bill Yi
c1363443ee Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I63fcff4de0780220331244eaeb16840cfeef600e
2023-07-31 16:13:38 -07:00
Bill Yi
d6e35474b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 99d99c1e0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic43dae4d1663df225e6e35b62323440f5ce68410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:24:33 +00:00
Bill Yi
1d4c7e2e14 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38360e14cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d19557d66ccf898c61d0c6d181d38995046faa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:24:30 +00:00
Bill Yi
0e1b9e98b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 50b783c347 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie34a242067efa4b853082003d6be5b94120ccdfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:24:24 +00:00
Bill Yi
dc6aa71631 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af361193ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23bb902b7220ae8f666ba53c70e671e537d12f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:24:14 +00:00
Bill Yi
ce7c2f90ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: aa0d143122 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id75cd984fa5444359762f0908e7a2af01911a36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:23:38 +00:00
Bill Yi
98a0fc97c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbcaa9aefa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0042e0a71546854c3fded0e60c39364d95263685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:23:05 +00:00
Bill Yi
99d99c1e0c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00
Bill Yi
50b783c347 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00