Commit Graph

26452 Commits

Author SHA1 Message Date
Joshua Mccloskey
eafa298200 Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev am: 8ff0234717
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19929437

Change-Id: Ida9695d5f938e31f27888c7e1c90600b17fd0804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 23:46:06 +00:00
Joshua Mccloskey
8ff0234717 Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev 2022-09-13 23:13:15 +00:00
TreeHugger Robot
41e6695253 Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev am: 97985b6219
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19926604

Change-Id: Idcda95ee3ea366c6a827b09cdfc91d565dabf73d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:32:42 +00:00
TreeHugger Robot
97985b6219 Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev 2022-09-13 01:23:37 +00:00
Joshua McCloskey
fccd144930 Add phone, tablet, device fp deletion strings.
Test: Manual.
Fixes: 245411037
Change-Id: Ib1d83072878ede27758beb0381a12cab6172b9d6
2022-09-12 21:00:58 +00:00
TreeHugger Robot
e6fd2a5da8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-12 17:41:49 +00:00
Sunny Shao
3e24aaf091 Allow summary string support both mobile and tablet devices
-Update the string to support mobile and tablet devices.

Bug: 244137320
Test: manual test
Change-Id: I74d8d6db76001a68a648030e0c94f769d220d762
2022-09-12 15:54:05 +08:00
Bill Yi
e1bfdaf22a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24e95f7af07133bd771ec2b0383a9a17c798d932
2022-09-11 16:30:55 -07:00
Bill Yi
61d351e93d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8de7d4371d314c5771fd9d8f41b664044929c7dc
2022-09-11 16:24:09 -07:00
Grace Cheng
3dc93daa7a Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev am: 19ee730df2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885882

Change-Id: Ia7abc775b5c535f7d126668f705830c8a2077726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 16:27:28 +00:00
Grace Cheng
19ee730df2 Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev 2022-09-09 16:24:06 +00:00
Grace Cheng
f15c726127 Update SFPS enrollment education assets and add light/dark theme colors
Updates SFPS enrollment education layout and adds new assets indicating
sensor location in each orientation. Also defines color codes and adds
LottieColorUtils to dynamically map LottieAnimationView colors from light/dark theme

Test: Observe correct assets during enrollment in all orientations
Fixes: 242074146
Fixes: 238596925
Change-Id: If3b7502350057cc9b04f12aa9a5b36be06958630
2022-09-09 07:09:27 +00:00
Peter Zhang
7572bafb98 Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev am: 66dee9be82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19867066

Change-Id: I058b6b73ec3d92d5d80c4dd59ae0d55954b7c496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 05:30:11 +00:00
Peter Zhang
66dee9be82 Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev 2022-09-08 05:07:30 +00:00
menghanli
70a63abfe4 Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme
Apply same the sub text style from seekbar preference

Bug: 219752953
Bug: 229722937
Bug: 245093240
Fix: 245093240
Test: Manual testing
Change-Id: If107452b942e23dee17c73873f4aedc3a25c7f5d
(cherry picked from commit a8b9c805a2)
2022-09-07 15:48:23 +00:00
Lucas Silva
fc577e23fc Update dream complications toggle summary am: 8f3ab66298
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19866826

Change-Id: I179940310aeb7e9c3745c89f433cd12acd20b1d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 15:32:01 +00:00
Lucas Silva
8f3ab66298 Update dream complications toggle summary
Change-Id: I49f3ac13bec5689e2aa69bae48f9a406ee6e467a
Fixes: 243973622
Test: manually flashed device and verified string in dream settings
2022-09-06 19:16:26 +00:00
Tiffany Nguyen
d36c2f7cba Align strings and UX across the different pages. am: c2ad30d432
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19728353

Change-Id: I0eabd6c4dd7f42020c2551f1f63f1cf20de33b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:20 +00:00
Tiffany Nguyen
9e491e0f1b Move restricted apps page to new battery optimization page. am: 032649b4f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19727752

Change-Id: I4285c9d6e7df762f697f5ad62fe30b2e6151cdd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:18 +00:00
Tiffany Nguyen
3fa60efb6c Add Apps > Battery optimization page implementation. am: 6147e0fa5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726219

Change-Id: I3498f3c1482acf6ece57bd1297bffd9c08d81c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:13 +00:00
YK Hung
0bad72889e Merge changes from topic "app_battery_usage" into tm-qpr-dev
* changes:
  Fix loading bug when switching filters.
  Align strings and UX across the different pages.
  Move restricted apps page to new battery optimization page.
  Add Apps > Battery optimization page implementation.
2022-09-05 03:17:57 +00:00
TreeHugger Robot
3888c098fb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-04 23:48:18 +00:00
Tiffany Nguyen
c2ad30d432 Align strings and UX across the different pages.
https://screenshot.googleplex.com/ercwXXcfg2QHkAW.png
https://screenshot.googleplex.com/AWfsrNWsJUbdF8x.png

Bug: 240711618
Test: Manual
Change-Id: I3d1083a7b50adffb67592b2e42914adf755bd6cd
(cherry picked from commit 1d1b115785)
Merged-In: I3d1083a7b50adffb67592b2e42914adf755bd6cd
2022-09-04 15:48:55 +00:00
Tiffany Nguyen
032649b4f8 Move restricted apps page to new battery optimization page.
New entry: https://screenshot.googleplex.com/BbU6RnQhBbpnBc3.png
Restricted: https://screenshot.googleplex.com/5ggid7TcSsH9CUF.png
Old entry: https://screenshot.googleplex.com/7JgZpSfKs5zZb3Z.png

Bug: 240711616
Test: manual
Change-Id: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
(cherry picked from commit 3acd34fe4a)
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
2022-09-04 15:48:46 +00:00
Tiffany Nguyen
6147e0fa5c Add Apps > Battery optimization page implementation.
Moving the old restricted page to the new optimization page will happen
in a follow-up CL.

Test: Unit, manual
Bug: 238026672
Change-Id: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
(cherry picked from commit 5ecb1a1d69)
Merged-In: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
2022-09-04 15:44:18 +00:00
Bill Yi
6feabc3dad Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ife12a14d256682be8ef013386f48640475820351
2022-09-03 19:55:38 -07:00
Bill Yi
50bf87b270 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic576bd07f7dce331e6dfbcf463f1976935f0de16
2022-09-03 19:46:21 -07:00
TreeHugger Robot
8f0b3c2d6a Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev am: 048bc692a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19774526

Change-Id: I0d86d362802950e46346718a02dc150fbfb59eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 21:05:43 +00:00
TreeHugger Robot
048bc692a4 Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev 2022-09-02 20:09:01 +00:00
YK Hung
06e92f5e45 Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101

Change-Id: I6c4d4d551dc4ccd1897422cd65bf26cadeb9994c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 15:46:17 +00:00
YK Hung
8bf872331b Merge "Update defend tips card" into tm-qpr-dev 2022-09-02 15:18:50 +00:00
Joe Bolinger
078f2c7d94 Merge "Add product variants for unicorn strings." into tm-qpr-dev am: f9e992f490
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19775632

Change-Id: I1eb23bbad270e8f44a234d05e490c0b81757f268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:10:54 +00:00
Joe Bolinger
f9e992f490 Merge "Add product variants for unicorn strings." into tm-qpr-dev 2022-09-01 19:14:35 +00:00
Joshua McCloskey
c76f988475 Updated fingerprint dialog deletion strings.
Test: Manual
Fixes: 234183857
Change-Id: Ieb500d52f705eb269937cd0fcd6b14081f9662ee
2022-09-01 17:27:51 +00:00
TreeHugger Robot
14fb5d73e1 Merge "Update the battery usage footer text from new UX review." into tm-qpr-dev am: d2074b38f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19800638

Change-Id: Idfed8a2a0baf80149469079dfc5ada14fa9e37d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 09:56:56 +00:00
TreeHugger Robot
d2074b38f2 Merge "Update the battery usage footer text from new UX review." into tm-qpr-dev 2022-09-01 09:23:28 +00:00
TreeHugger Robot
be48ee08a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-01 05:29:06 +00:00
TreeHugger Robot
cf1580e298 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-01 05:29:06 +00:00
Wesley
243b450428 Update defend tips card
- Update defend tips card to unclickable
 - Update secondary button's action and content description
 screenshot: https://screenshot.googleplex.com/BYU8Mh5abJ9Tirh.png

Bug: 243769797
Bug: 243641857
Bug: 244219076
Test: make SettingsRoboTests
Change-Id: I7fdf5f7404d33f0374a992c83a7653a01b9f11bc
2022-09-01 04:09:31 +00:00
Zaiyue Xue
43974fb247 Update the battery usage footer text from new UX review.
Fix: 242817645
Bug: 242817645
Test: manual
Change-Id: Ia353700f6d9c0f25d2af72110afcd539ae9068b0
2022-09-01 11:11:08 +08:00
Grace Cheng
35125a3d2b Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev am: 2c9dab6f0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562137

Change-Id: I11ce675560e40ab1c946b01e14fee329e77bfac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 01:13:36 +00:00
Grace Cheng
2c9dab6f0a Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev 2022-09-01 00:47:41 +00:00
Grace Cheng
4a187e15d6 Implement SFPS guided enrollment for T6
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.

Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Fixes: 243813773
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
Merged-In: I1fa0b9349545586919eceeb9d05f365c2f2ec491
2022-09-01 00:47:22 +00:00
Bill Yi
1c4ee7aaaa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ida84975d7fb22c3592dc2b183f10a98802aef896
2022-08-31 16:22:03 -07:00
Bill Yi
e9d24dd8f2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I75226108b861bcd5f06ce0e6270b8dd13ab22b82
2022-08-31 16:18:02 -07:00
TreeHugger Robot
641e7bc1cd Merge "Allow footer string support both mobile and tablet devices" into tm-qpr-dev am: 282d38eba2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781367

Change-Id: I043f96e50550c20d1d9be22c77deb6fcb969ff08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 08:07:48 +00:00
TreeHugger Robot
282d38eba2 Merge "Allow footer string support both mobile and tablet devices" into tm-qpr-dev 2022-08-31 07:48:04 +00:00
Zaiyue Xue
48aac9b0e7 Allow footer string support both mobile and tablet devices
Update the string to support mobile and tablet different devices term (not code changes, only the string resource)

Bug: 243878095
Fix: 243878095
Test: presubmit
Change-Id: I6f4496a961671a478d36645113e30b45391d7d8a
2022-08-30 18:49:44 +00:00
Joe Bolinger
65e7ff1dea Add product variants for unicorn strings.
Bug: 243897496
Test: N/A
Change-Id: Iac80e0aefe7a45603217e50b9b177b28329632e8
2022-08-30 11:31:29 -07:00
Austin Delgado
71b2bb8f5c Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev am: bbcdc91967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19582557

Change-Id: I7270f6c80cef2c28697e1ba85c9fcaaf57f25263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:37:21 +00:00