Commit Graph

27839 Commits

Author SHA1 Message Date
TreeHugger Robot
47aed3060e Merge "Add "Data Sharing Updates" to legacy Privacy Page" 2023-01-11 02:26:04 +00:00
TreeHugger Robot
6eedc1cdfe Merge "Update string" into tm-qpr-dev am: 8dc66bc482 am: 26f47177a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20925429

Change-Id: I08496788be3e791658c54564e59f0e462ca9669e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 20:57:52 +00:00
TreeHugger Robot
26f47177a3 Merge "Update string" into tm-qpr-dev am: 8dc66bc482
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20925429

Change-Id: I484277c3466ccc0a48f276e3bd0b933ab6be34d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 20:00:50 +00:00
Hao Dong
22fc2f387b Merge "Add a flag for moving UdfpsEnroll* from SystemUI to settings." 2023-01-10 18:02:42 +00:00
Amy Hsu
7e36e664b6 Merge "[RRS] show resolution option on Settings page." 2023-01-10 16:47:56 +00:00
Julia Reynolds
fc63046f32 Update string
Test: view string in UI
Fixes: 262094151
Change-Id: I4f55c340d3144d446465d64008d9d92d622425ae
2023-01-10 16:23:57 +00:00
Vania Januar
f640bb1e6d Merge "Show None default app in stylus preference if no Notes holder." 2023-01-10 12:22:22 +00:00
Amy Hsu
0d9e5d600c [RRS] show resolution option on Settings page.
Due to the special width/ height of the device, we have to modify the
available condition otherwise the resolution option cannot be shown on Settings.

Bug: 258346214
Test: Lunch Settings and check the Display page
Change-Id: I577e0e1227727aab75787c1f6115091e0c6158e1
2023-01-10 07:41:43 +00:00
Bonian Chen
817786c698 Merge "[Settings] Support of Primary IMEI feature" 2023-01-10 05:39:15 +00:00
Nate Myren
027d64c84c Add "Data Sharing Updates" to legacy Privacy Page
Note: Strings are non-final

Test: manual
Fixes: 261663929
Change-Id: Ia036a3bf715d10f94f17faf5b571896ca229a39a
2023-01-09 16:47:35 -08:00
Tom Hsu
8e631a1905 Merge "[Regional preferences] Add numbering system page." 2023-01-09 17:25:10 +00:00
tom hsu
6461d16c59 [Regional preferences] Add numbering system page.
- Add language selection page
 - Add number format page
 - Refactor some part for readability.

Bug: b/247073388
Bug: b/246929960
Test: atest pass

Change-Id: I617698a3146b6e461467a97de8c08f4c4dc6e7f2
2023-01-09 22:54:57 +08:00
Zaiyue Xue
48a1dacc39 [Battery usage U] [UI] Show screen time in the battery usage app list items
https://drive.google.com/file/d/1N2yrra6cga6CRIXzxTGhctcxwN47lE89/view?resourcekey=0-qlw1a78Ph-gSfXFAHKoumQ
https://drive.google.com/file/d/1joSI3YL8dn0rRW1Ywyte7MUy_CTDFS2p/view?resourcekey=0-VsgaqSi2YUfn6ImZEOBH-g

Bug: 258120710
Test: manual
Change-Id: Id22d2490d0bffeb8b7d2e0941bcdb4e3d352e966
2023-01-09 17:26:56 +08:00
Bill Lin
3072c2a571 Merge "5/ Refine SetupChooseLockPattern layout by design" 2023-01-09 04:46:04 +00:00
Bill Lin
5f1fcab0fa Merge changes from topic "tuscany_settings_posture_support"
* changes:
  3-1/ Impl FoldProvider.FoldCallback for Face enroll activities
  2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow
2023-01-09 04:26:50 +00:00
Bill Yi
9f8b28eaf4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I76b6b2f37d0dee1347d3c5b16b9d6ba3088b31aa
2023-01-08 02:43:59 -08:00
lbill
7135d36d37 5/ Refine SetupChooseLockPattern layout by design
Since the SetupChooseLockPattern include header icon
header title, header sub-title, pattern state description,
LockPatternView and FooterBar, there was a limited room
for LockPatternView especially in the confirm steps which
both header title and pattern description occupy 2 lines space.
Hance the PatternView size used to inconsistence in-between
1st draw and 2nd confirm draw, besides it's visual looks
jumping and small on some device which have smaller display.

This solution includes 3 changes:
1. Organized the pattern view message to leverage
   header sub-title view, then we can resever more space.
   (Set minHeight=2 for sub-title)
2. Set screen_lock_options button visibilty to GONE when
   the stage in 2nd confirmation.(Previously it's INVISIBLE
   and reserve additional space)
3. Let LockPatternView align bottom of FrameLayout to prevent
   the view juming and flicker.
4. Clean up unused forAnyBiometric flag and code.
5. GlifLayout.getDescriptionTextView() == mHeaderView
   Need setDescriptionText() to make the view from GONE -> VISIBLE
6. Polish the stage flow and ensure IntroductionStage show
   correct message
7. Add ChooseLockPattern into embeded activity white list
   Force show ChooseLockPattern in fullscreen in case the Pattern
   view truncated in `NeedToConfirmStage` where the title showing
   2 lines and push pattern view down, and get bad UX in the
   device which integrate a shorter display.
8. Add test cases for all stage and polish legacy test code.

Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
     "com.android.settings.password.SetupChooseLockPatternTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
     "com.android.settings.password.ChooseLockPatternTest"
Bug: 249974175
Bug: 260027850
Change-Id: I868af9b14ba99af5d78a05f6c2a570ccc07aea15
2023-01-07 19:36:47 +00:00
TreeHugger Robot
d6905dd6ce Merge "[Battery usage U] [UI] Show total "Screen On Time" in the battery usage page" 2023-01-07 03:22:46 +00:00
lbill
ee6366761b 3-1/ Impl FoldProvider.FoldCallback for Face enroll activities
Create a mechanism to allow OEM config posture guidance with
'config_face_enroll_guidance_page', and customize the config
'config_face_enroll_supported_posture' with standard postures
         0 : DEVICE_POSTURE_UNKNOWN
         1 : DEVICE_POSTURE_CLOSED
         2 : DEVICE_POSTURE_HALF_OPENED
         3 : DEVICE_POSTURE_OPENED
         4 : DEVICE_POSTURE_FLIPPED
For example, if we set 1 for the device, then device only
allow to enroll face in closed(folded) state, if device do
not in the allow state, we will prompt specific guidance
page activity defined in config_face_enroll_guidance_page.

At this stage , we only integrate 2 states OPENED/CLOSED through
ScreenSizeFoldProvider and register for onFoldUpdated() callback
- isFold(DEVICE_POSTURE_CLOSED): finish posture guidance
- !isFold(DEVICE_POSTURE_OPENED): launch posture guidance
- onActivityResult : reset mOnGuidanceShown false

1. Fix A11y lottie animation bug
2. Impl FoldProvider.FoldCallback
3. Register callback to ScreenSizeFoldProvider
4. Integrate back stack, skip, cancel events
   - Back key : RESULT_CANCELED
   - Skip btn : RESULT_SKIP
   - Posture changed : RESULT_FINISHED
5. Set single instance for relative activities
6. FaceEnrollFoldPage listen for onConfigurationChanged()
7. Add empty face_posture_guidance_lottie.json for overlay

Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
      "com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
      "com.android.settings.biometrics.face.FaceEnrollIntroductionTest"
Test: Manual launch security settings face enroll, unfold device
and observe posture guidance showing fullscreen on top
Test: Fold device ensure the posture guidance activity finish
Bug: 261141826
Fixes: 231908496

Change-Id: Ib9f43f82f7d19f3f187c2f6f8984e76cd843afbc
2023-01-06 19:54:03 +00:00
lbill
1eee5eda6c 2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow
1. Add config_suw_support_face_enroll default is TRUE
2. Impl FaceFeatureProvider to obtain the config
3. Overlay config_suw_support_face_enroll by requirements

Test: Flash build and manual check if device go through face enroll in SUW
Bug: 262469686
Change-Id: I61aa5c818bedfb490f2172a7481f59fda7295c1a
2023-01-06 19:29:51 +00:00
Bill Yi
d227fbe832 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-06 18:37:48 +00:00
Bonian Chen
7a714456fd [Settings] Support of Primary IMEI feature
Present primary IMEI information when there're multiple.

Bug: 260188417
Test: local

Change-Id: I7817fed506f8fc4fabd94f004c9a74b2fab25e10
2023-01-06 13:22:18 +00:00
Vania Januar
ce93c656aa Show None default app in stylus preference if no Notes holder.
This also fixes the role holder not updating when the
default role holder has changed.

Test: StylusDevicesControllerTest
Bug: 254834764
Change-Id: Iec7ed7698f18279da9a04918dcdf3e20e73609d1
2023-01-06 11:25:35 +00:00
Zaiyue Xue
833e47d851 [Battery usage U] [UI] Show total "Screen On Time" in the battery usage page
Screen record: https://drive.google.com/open?id=16ZOp1E2YBzWQXbnXl786FaLFPel-S9CF&authuser=0&resourcekey=0-oRqCrdTc9FZjVgsq9orhEw&usp=drive_link
For Arabic: https://drive.google.com/open?id=1zh_4jcUnqLC6CDgwju1qQkWJ0QCtm19c&authuser=0&resourcekey=0-kuKfDdOTWxqOUmD0RfPNLQ&usp=drive_link

Next step: show screen on time for each app

Bug: 258120710
Test: manual
Change-Id: I2085a2a85ebd50b2ac876972f6a8ebbf6f20246c
2023-01-06 19:09:52 +08:00
Bill Yi
2681d8cc05 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
2023-01-05 18:07:21 -08:00
TreeHugger Robot
a0d84081e2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-05 20:13:42 +00:00
TreeHugger Robot
80404721aa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-05 20:13:42 +00:00
TreeHugger Robot
2ff2a828f2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-05 20:06:08 +00:00
TreeHugger Robot
2d35260ed4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-05 20:06:08 +00:00
Chaohui Wang
c1f7222273 Merge "Move product specific strings to res-product" 2023-01-05 08:55:25 +00:00
Zaiyue Xue
f1fd444c6d Merge "[Battery usage U] Add an item "Others" in the app list to group small usage apps. This will make the total percetage 100%, which is easy to understand for users." 2023-01-05 06:34:02 +00:00
Chaohui Wang
01c31d77e0 Move product specific strings to res-product
Product specific strings need to be put in res-product.

Bug: 250807976
Test: Make Settings
Change-Id: I59fe9f54759a518468395ae6e1448c97d952e22d
2023-01-05 14:18:30 +08:00
Tom Hsu
8d13ea9e64 Merge "[Regional Preference] Create each page for regional preferences" 2023-01-05 05:34:10 +00:00
Zaiyue Xue
7c987c9d98 [Battery usage U] Add an item "Others" in the app list to group small usage apps. This will make the total percetage 100%, which is easy to understand for users.
Bug: 258124173
Fix: 258124173
Test: manual
Change-Id: I5965eeb73a2071c4a9994655e4ed24ec3adf64e8
2023-01-05 11:22:33 +08:00
tom hsu
278f2b07f4 [Regional Preference] Create each page for regional preferences
- Temperature unit
 - Calendar type
 - First day of week

Bug: b/246929960
Bug: b/247072550
Bug: b/247071792
Bug: b/247071572
Test: atest passed
Test: Manual test passed

Change-Id: Iea093588da33b352b5e7bfa5c483659e7afb8296
2023-01-05 10:10:44 +08:00
Grace Cheng
1c8455dfea Merge "Adding product string variants on choose lock page" into tm-qpr-dev am: a301ba8a68 am: 40fccabd62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853551

Change-Id: I03a3823880db1400d7bd63d7edf04a2b46411cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 21:40:53 +00:00
Grace Cheng
40fccabd62 Merge "Adding product string variants on choose lock page" into tm-qpr-dev am: a301ba8a68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853551

Change-Id: I7f51cad43e1a26e6cc421b8aa03106f545fc84fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 20:53:32 +00:00
Grace Cheng
a301ba8a68 Merge "Adding product string variants on choose lock page" into tm-qpr-dev 2023-01-04 20:30:37 +00:00
Bill Yi
7c9e45aa7f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I812eac5b1fa960b6128466885b6fd18661ec73e8
2023-01-04 09:37:46 -08:00
Bill Yi
38268df283 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie79ca403bec54dde34679db06de8813e5aaedc77
2023-01-04 09:36:13 -08:00
Bill Yi
27475aaed6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I28455e9f43d4d44da8708dd15056e2493c017218
2023-01-04 09:32:28 -08:00
Bill Yi
6480a5ff9c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia1c2df934afa7f83fb9990b59be46adaf88c2329
2023-01-04 09:29:44 -08:00
Bill Yi
1c4c4b07c5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If343e1104b35ab0eca0946fc93a32fc0a114902f
2023-01-04 09:28:14 -08:00
Bonian Chen
feb6c451e3 Merge "[Settings] Adjust string resource for ID" 2023-01-04 17:06:11 +00:00
Zaiyue Xue
e756675e69 Combine system apps to one item in the battery usage app list.
Bug: 262952385
Test: 262952385
Test: maunal
Change-Id: I078677b13a22f5e2f8f194bb5d5259f8c54c6b1e
2023-01-04 20:32:56 +08:00
Zaiyue Xue
778a4b42e3 Replace battery usage breakdown list from tabs to dropdown list.
screen records:
https://drive.google.com/file/d/15VJGQ_G2KIpyFcvZsyE0iRno0WZhfjGb/view?usp=sharing&resourcekey=0-bg48BsC2b-BT_80CGlzpWg
https://drive.google.com/file/d/1RaoysytQ5oZQu8CNPhYgxqBahk3UfVbr/view?usp=sharing&resourcekey=0-Xk2J36fjYWBo6KpFTrMr4Q

Bug: 264338267
Fix: 264338267
Test: manual
Change-Id: Ic020cce711b5232adfc80272836d7c2d0250d94a
2023-01-04 16:20:47 +08:00
Yasin Kilicdere
541a984ce0 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I64b7be5d06cc021d992ed2ca1d84305669234fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 23:03:32 +00:00
Hao Dong
af35c7cb9d Add a flag for moving UdfpsEnroll* from SystemUI to settings.
The added files in this CL are mostly copied from SystemUI. Enabling the flag SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS with this CL, the udfps enrollment icons and progress bar are shown in settings.

Turn this flag on via adb:
adb shell setprop sys.fflag.override.settings_show_udfps_enroll_in_settings true

There are some known issues that will be fixed in the following CLs, including:
- When the finger is down on the screen and the lighting circle on the sensor is shown, the fingerprint icon is not hidden.
- When rotating the screen, fingerprint location is not right.
- Currently the scale factor is hard coded for pixel 7 pro, we should update the scale factor based on the device, etc.

Test: manually tested on device
Bug: 260617060
Change-Id: I5aede070eb1de9eb3b5e1400d6e51a8523079852
2023-01-03 19:37:42 +00:00
Bonian Chen
6a3e40e87e [Settings] Adjust string resource for ID
Bug: 260806431
Test: build pass
Change-Id: I49a7fe8b504651446be0c0ebdbaa48d764473372
2023-01-03 15:34:44 +00:00
Yasin Kilicdere
85379e9452 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 13:25:59 +00:00