Commit Graph

129704 Commits

Author SHA1 Message Date
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
Bill Yi
aa0d143122 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00
Graciela Wissen Putri
f6506e0e00 Add intent to access aspect ratio app list page
adb shell am start -a android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS -c android.intent.category.DEFAULT

Bug: 293137080
Test: Manual
Change-Id: I125d1507c48b02621b5ebb79dcf17aef7deb9bb7
2023-07-31 14:27:40 +00:00
Matt Casey
9a7ed87222 Remove dependency on ChooserActivity resources
Fork the needed resources.

Bug: 292222314
Test: mp sysuig, view wifi QR code screen
Change-Id: I69fabb8c293e8e8819d93a61df39549b9667c0fa
2023-07-31 14:17:40 +00:00
Quang Luong
f55e922301 Merge "Fix duplicate network request entry during connection" into udc-qpr-dev am: af1715e4a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196268

Change-Id: Ie52f8c49a6aaaae0c6932083e7efeba4121298a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 09:16:58 +00:00
Quang Luong
af1715e4a0 Merge "Fix duplicate network request entry during connection" into udc-qpr-dev 2023-07-31 08:34:49 +00:00
Quang Anh Luong
ae485a6774 Fix duplicate network request entry during connection
When connecting to a network request, a new NetworkRequestEntry is
created by WifiPickerTracker alongside the unsaved regular network,
which results in two of the same network appearing during the L2
connection phase. To fix this, filter out any disconnected networks that
have the same SSID and security type as the currently connecting
network.

Bug: 292064115
Test: manually verify no duplicate network appears when connecting to
network request

Change-Id: I3d6abb0d0a1e4eeab1b8fa396660851ba090c611
2023-07-31 14:51:07 +09:00
Treehugger Robot
b05c1aa2fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 5931e209fb -s ours am: 32d5ef74fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1de1042dc79d23ee10777d3e7b1a54e097cd043e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:40:53 +00:00
Bill Yi
717ff8f4cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: 1133ecb114 -s ours am: 177be97b58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifdb1554d445cbd04fb240c07c7d1b82d1db823a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:40:46 +00:00
Treehugger Robot
a1d52b6108 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -s ours am: 868cfd4209 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica383dd679708418fd97c9a341f0a593bd8cb0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:39:51 +00:00
Bill Yi
d84172e081 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -s ours am: 5038667845 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieaa8829e54f7d2dc320f7e845afb07f25a420e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:39:44 +00:00
Treehugger Robot
eb73e4002a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: b750e93272 -s ours am: 8d74cd751d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c713be8ed14a60f69039b4891a45cf3b945afe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:34:44 +00:00
Bill Yi
73014f9d8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: 31ea0ae325 -s ours am: b6e4f5347a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2216394c9861ffb8f00e0c1bfb80ea691b78eb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:34:37 +00:00
Automerger Merge Worker
4f57ccddbe Merge changes from topic "am-25d5d76ca46e4430a3b3dfa6bff0dfdc" into udc-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: f4fe175b59 -s ours am: b5d2ff6e1a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: ed9ae7fd73 -s ours am: 6f28fb73b6 -s ours
2023-07-28 19:30:52 +00:00
Treehugger Robot
99e2fd95db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -s ours am: baf2971e15 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida246aee3983905c075a650d1074d380e504b21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:30:25 +00:00
Treehugger Robot
0330e02f3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: f4fe175b59 -s ours am: b5d2ff6e1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide9881a21eeca0e064ca06d97a9a5e25ec61034b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:30:22 +00:00
Bill Yi
3d32a40a33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -s ours am: e30de33272 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2fc2c73eea210f86ad1127c39a3a638d1efe95d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:30:20 +00:00