Commit Graph

8541 Commits

Author SHA1 Message Date
TreeHugger Robot
bcbe39f4a4 Merge "Update the battery usage footer text from new UX review." into tm-qpr-dev am: d2074b38f2 am: 14fb5d73e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19800638

Change-Id: I63d989488f570326d7a61b9f953a4c6b792a647c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 10:56:53 +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
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
Grace Cheng
230f4193fb Merge "Implement SFPS guided enrollment for T6" 2022-09-01 00:46:25 +00:00
Grace Cheng
219b28bb8d 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
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
2022-08-31 20:15:55 +00:00
TreeHugger Robot
cb97ad28c7 Merge "Allow footer string support both mobile and tablet devices" into tm-qpr-dev am: 282d38eba2 am: 641e7bc1cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781367

Change-Id: I443b6a0cc4c17dafc546b093f83ba248d711015f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 08:37:16 +00: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
Joe Bolinger
185b868808 Add product variants for unicorn strings.
Bug: 243897496
Test: N/A
Change-Id: Iac80e0aefe7a45603217e50b9b177b28329632e8
2022-08-30 22:13:00 +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
Daniel Huang
7505e97ce9 Merge "Separate "Keyboard" from "Language & input"" 2022-08-30 08:20:14 +00:00
danielwbhuang
c9cb6806f6 Separate "Keyboard" from "Language & input"
1. Separate "Keyboard" from "Language & input".
2. Use FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI to control the
   different UI until Settings launches the new UI design.

Bug: 242680328
Test: local test
Change-Id: Id1ea6d3e3c2e6b83bc4b4d835c6b27e31311c530
2022-08-30 14:22:05 +08:00
Lauren Winston
28b4b34f92 Add toggles for two Software Cursor settings: keyboard shift and trigger
hints.

Bug: 242218807
Test: atest SoftwareCursorKeyboardShiftPreferenceControllerTest and
SoftwareCursorTriggerHintsPreferenceControllerTest

Change-Id: I872291ee90b54842b237868a72d61b38efbfd886
2022-08-29 22:12:46 +00:00
TreeHugger Robot
66a56fdd37 Merge "Remove duplicate strings." 2022-08-26 17:52:54 +00:00
Kweku Adams
5949fccc7a Remove duplicate strings.
"Yes" and "no" were redefined many times with no clear benefit, so this
consolidates them into one definition.

Bug: 243843096
Test: Build, install, and open the Settings app
Test: atest SettingsRoboTests
Change-Id: I5f84d09f223efd478461ded93aeac82bf7b128d8
2022-08-26 00:07:08 +00:00
Joshua Mccloskey
94859d0642 Merge "Replaced fingerprint finish strings." into tm-qpr-dev am: 128746648e am: f74ddd65b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19736606

Change-Id: Ifefac73fa45e44816efd0cae2cea58ea0a30a135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 22:56:07 +00:00
Joshua Mccloskey
f74ddd65b8 Merge "Replaced fingerprint finish strings." into tm-qpr-dev am: 128746648e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19736606

Change-Id: Iab77f3cf874f4271f603a9575afeff0ffd8732af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 22:35:13 +00:00
Joshua Mccloskey
128746648e Merge "Replaced fingerprint finish strings." into tm-qpr-dev 2022-08-25 22:20:32 +00:00
Tom Hsu
039563f77d Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3 am: 7dfd2ade2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790

Change-Id: Ia139b19e541ebc66ea0228417a4cefa06a4ce93d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 07:44:56 +00:00
Tom Hsu
7dfd2ade2f Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790

Change-Id: I767bf8a2b177a5b764458e7c8fff90e3de1b869b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 07:25:42 +00:00
Tom Hsu
bd3c0da9e3 Merge "[Languages] Add new information to system language page." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
TreeHugger Robot
5d42149249 Merge changes from topic "nfc_logging_control_master"
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
2022-08-25 03:31:24 +00:00
Joshua McCloskey
15a1adbe8f Replaced fingerprint finish strings.
Test: Verified manually correct string shows.
Fixes: 239614495
Change-Id: I5b52d21fb6a9faf5769de46ccb17308a1649e22a
2022-08-25 00:35:09 +00:00
TreeHugger Robot
3588b515f2 Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19711303

Change-Id: I137233586abf15929227f3795ef061699a7335e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 06:01:14 +00:00
tom hsu
3cbb6f8680 [Languages] Add new information to system language page.
- Add top Intro preference
 - Add footer preference
 - Add sub string to language picker
 - Modify title of app locale pages

Bug: 242182598 Add information to system language page.
Bug: 241600418 [Panlingual] Change strings on App languages
Test: Maunal test
Change-Id: I9bca8911e8e70c97c273294b3c9d1d73d4ea0cb2
2022-08-24 11:04:24 +08:00
Zaiyue Xue
2a57f5de8d Port battery usage bug fixing cls from master to tm-qpr-dev
This cl is a merge of the following 5 cls:
ag/19674112	Fix b/242989581: The two battery charts have the same label
ag/19667114	Support data logging for battery usage new chart view
ag/19636171	Support data logging for battery usage new chart view
ag/19682758	Resolve insufficient contrast for system component icons
ag/19697763	Add fade in animation for battery usage chart group

Bug: 242989581
Bug: 242810430
Bug: 242989982
Test: presubmit
Change-Id: I39cd0f88ce62a280a966750082a40f8a537b9616
Merged-In: Ice30508bc20b5de631efee0db0160fe6ad710dbb
2022-08-23 19:30:49 +08:00
TreeHugger Robot
63e627ca93 Merge "Show 'Clear storage' on customize manage space button" 2022-08-23 10:47:55 +00:00
Arc Wang
47532e9d76 Show 'Clear storage' on customize manage space button
Settings app may show 'Clear storage' button to clear data
or 'Manage space' button to show app customize manage space UI.

To have a consistent UI, shows 'Clear storage' button
for the 2 cases.

Fix: 241486222
Test: manual visual
      Settings -> Apps -> See all apps -> Photos
      -> Storage & cache
Change-Id: I09f2e651a2844ef809ee269c7114296af69e6bb9
2022-08-23 16:48:00 +08:00
Michael Mikhail
8cda408a2b Merge "Add media on lock screen setting" into tm-qpr-dev am: c77ab55735 am: d06eaf6f43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457762

Change-Id: If15ce6d0b86fb2eab04b7784e378387e2f776918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 15:22:40 +00:00
Michael Mikhail
d06eaf6f43 Merge "Add media on lock screen setting" into tm-qpr-dev am: c77ab55735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457762

Change-Id: I9bfdf646fb6191e201ce014b610cf612c037443f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 15:04:04 +00:00
Michael Mikhail
c77ab55735 Merge "Add media on lock screen setting" into tm-qpr-dev 2022-08-22 14:46:06 +00:00
Jack Yu
3d2aff896e Add a new NFC developer setting option for NFC vendor verbose log
Add a new developer setting option to enable vendor verbose log.

Bug: 204397062
Test: manual
Change-Id: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
2022-08-22 08:46:59 +00:00
Jack Yu
b71de640b5 Add a new NFC developer setting option for NFCSNOOP
Add a new developer setting option to enable full NFCSNOOP log.

Bug: 204397062
Test: manual
Change-Id: I3fd34500e5e7093c9d77ff737987a35f6866814e
2022-08-22 08:42:20 +00:00
Sayak Dutta
05b7cb0225 Merge "Revamp SD card UX" into tm-qpr-dev am: e66ae3f9db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673917

Change-Id: I589676bfca185db1bbefbe804e9512b72142676d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 06:33:54 +00:00
Sayak Dutta
e66ae3f9db Merge "Revamp SD card UX" into tm-qpr-dev 2022-08-22 06:13:30 +00:00
Wesley Wang
08345933df Merge "Update Settings charging string" into tm-qpr-dev am: 4909c7923b am: 7ffe4ed694
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19568529

Change-Id: Iaa3ff1fe5326ddce4752aa873424681ef34d284f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 03:02:24 +00:00
Wesley Wang
7ffe4ed694 Merge "Update Settings charging string" into tm-qpr-dev am: 4909c7923b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19568529

Change-Id: I7a115aed0ce30980579c8b2afb6335182d78d3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 02:44:03 +00:00
Tiffany Nguyen
2c1decd7a0 Merge changes from topic "battery_usage_list"
* changes:
  Align strings and UX across the different pages.
  Move restricted apps page to new battery optimization page.
2022-08-19 21:04:08 +00:00
sayakiitg
efdedcdc15 Revamp SD card UX
Improve the SD card setup flow so that each formatting option is provided in a separate screen with clear description and illustration.Also make sure that guest users do not have any access to formatting options.

Test: Manual testing on Pixel Device
Screenshot1: https://screenshot.googleplex.com/WJwyxFkBtbSfZmN.png
Screenshot2: https://screenshot.googleplex.com/3oBcrrgRsKTxNPC.png

Bug: 201252175
Change-Id: I77df55c40fd99cabcfc6128084be035bb5b19531

Change-Id: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
(cherry picked from commit 9b432d54a6)
Merged-In: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
2022-08-19 19:07:40 +00:00
Zaiyue Xue
575972632b Merge "Fix b/242989581: The two battery charts have the same label" 2022-08-19 11:38:41 +00:00
Wesley Wang
4dd92bf5a1 Update Settings charging string
- Update charging protected string

Bug: 236798712
Test: make and verify strings
Change-Id: I86e063191b42e98d8836a6dbe3b32ff3ce3bb8d0
2022-08-19 18:18:02 +08:00
Zaiyue Xue
8e11085436 Fix b/242989581: The two battery charts have the same label
Bug: 242989581
Fix: 242989581
Test: manual
Change-Id: I8fc6c13351b46f4e29daf2f28201d99d8087092f
2022-08-19 14:33:03 +08:00
YK Hung
f2bbdf5035 Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev am: aa3262857c am: 939f2a9eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19633714

Change-Id: I582c5cc6df9b9454013b4435d261c336fc4e7a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 03:23:26 +00:00
YK Hung
939f2a9eed Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev am: aa3262857c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19633714

Change-Id: I691685d2190e03c917e9cee6ef9dc94a94e97f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 03:04:12 +00:00
YK Hung
aa3262857c Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev 2022-08-19 02:43:57 +00:00
YK Hung
6992c28b4a Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev am: c586e1e427
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569019

Change-Id: I69ba753143ff1bb5fab2db8a53785540530e3c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 01:50:45 +00:00
YK Hung
c586e1e427 Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev 2022-08-19 01:30:51 +00:00