Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,605 Commits 1 Branch 0 Tags
2bae84259f00a1b729473de8da40cd22e1c64acc
Commit Graph

11900 Commits

Author SHA1 Message Date
TreeHugger Robot
80190179ba Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c am: ed35b5e376 am: 672ef42ab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I4934e755229741218d3b8979fc8318a2b412f168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 21:28:05 +00:00
Jigar Thakkar
b6e12d7ff1 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 28449684ca am: 33f1f4c479 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I196a12897085e7dd54caf5dcc3110c9b4a8a922e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 20:46:31 +00:00
Marcello Galhardo
6255d37ad9 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e am: af658f1ab4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: Iab8c01d073f10dbbb55ebead9b8a883f5a93065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:57:21 +00:00
Bill Lin
4caa3ece94 [conflict] Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1 am: e5dfcc0270 am: 547f6d63a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I61fed7e932c8dc476b689ca61bbf8ee919924bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 16:29:52 +00:00
TreeHugger Robot
1e7990341c Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I3e9f8ee058f36819fad9675afd69f07d6524cbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 15:24:16 +00:00
TreeHugger Robot
c0c0edd078 Merge "Fix title of no-screen-lock notification" into udc-dev 2023-05-10 14:33:36 +00:00
Jigar Thakkar
854a93c2d3 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I1b5382aa0f132545d23082e3273e4756aa5d54ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:40:58 +00:00
Jigar Thakkar
002f06e120 Merge "Modify clone profile accounts info section" into udc-dev 2023-05-10 13:38:58 +00:00
Marcello Galhardo
d608996d1f Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I1bccba1b2642e39155543448f4d2feba3139f736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 09:44:40 +00:00
Marcello Galhardo
f5a3485300 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev 2023-05-10 09:23:52 +00:00
Hao Dong
bb03fc355e Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." 2023-05-10 00:48:15 +00:00
Bill Lin
f6d23468b1 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I4606997e91b4e23c76480362c6736efb464d7652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:28:30 +00:00
Hao Dong
968c5fb6f0 Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen. 
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
 2023-05-09 21:32:44 +00:00
lbill
67d6dff7cc Refine SkipDialog title and desc by device configs 
1. Wrap isFaceSupportedInSUW() in Settings Utils
2. Wrap getCombinedScreenLockOptions in Settings Utils
3. Add EXTRA_KEY_FOR_SUW to judge if in SUW flow
4. Refactor SetupSkipDialog by hasFace, hasFingerprint,
   isSuw, isFaceSupported conditions
5. Clean up the mapping logic of SetupSkipDialog
6. Replace bools with @LockPatternUtils.CredentialType
7. Refine the logic for isFaceSupported
   ---------------------------------------
   Config |SuwSupportFace|!SuwSupportFace|
    isSuw |    true      |      false    |
   !isSuw |   hasFace    |     hasFace   |

Bug: 263070591
Bug: 279389803
Bug: 279195215
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: SUW(workprofile), post-SUW
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Test: m RunSettingsRoboTests ROBOTEST_FILTER=SetupSkipDialogTest
Change-Id: Ie7af4299695dc3983b4190929b4dd659c301c082
 2023-05-09 09:55:52 +00:00
Derek Jedral
898e1d95f3 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: I73bb1c3acb600908a9dca9eff4fa7b01486b78c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 21:46:18 +00:00
Derek Jedral
b3524b4223 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 60419e72bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: I8201e20c39ef02beebb117731b7ed9dcc105bae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 20:27:38 +00:00
Derek Jedral
42deb763e0 Merge "Change preference title if Active Unlock enabled" into udc-dev 2023-05-08 17:56:32 +00:00
Treehugger Robot
6da502033a Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 2b6cf42130 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I6d2fb3b56242c3f2e089093cbe3081e2ef0ac30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:38:37 +00:00
Treehugger Robot
b5682235cc Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I18598bec86a2ad09837544559b7044eda190a247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:00:53 +00:00
ykhung
f31c8a477f Fix the battery string incorrect spelling 
Fix: 281473201
Test: presubmit
Change-Id: I9e4eb7f6c18918620a5e12680a30a5ba8bc7aa42
 2023-05-08 16:10:27 +08:00
Jack He
e64f750f61 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: e188c6c0bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I23d06ed58ed7725bfb1eed931db3ba313291c1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:57:41 +00:00
Jack He
22e2bd2b85 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I5ad786001f89627dbede25e1db8aae59da83af82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:16:06 +00:00
Jack He
2605ccbcfa Merge changes from topic "LeAudioBeta" into udc-dev 
* changes:
  Hide the LE audio toggle by flag
  Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
 2023-05-06 00:42:40 +00:00
Max Spencer
bd861db36f Fix title of no-screen-lock notification 
Discrepancy was surfaced during localisation testing.

Fix: 281054224
Test: None
Change-Id: Ifabafbf5af0775e25b2c41670318a3aabc2cb7f2
 2023-05-05 16:21:52 +00:00
Marcello Galhardo
bb8c04e072 Move Note Shortcut from Settings to SystemUI 
* Removes all code related to Note Shortcut from Settings

Test: manual
Flag: not needed
Fixes: b/280431176
Change-Id: I6bb6cfbb98a57b6ad3cf261626b3d84d0be96e53
 2023-05-05 14:54:27 +00:00
Daniel Huang
6ba9799131 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: 6d36372c64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: Ie57f1366b838b84b2af46edaa023fe1973ab4e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:44:33 +00:00
Daniel Huang
da19d4a244 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I6bcdd801f50041a36f20443a0b2365e433ca7382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:28:46 +00:00
Daniel Huang
4f541df33e Merge "Fix Multiple UI issues" into udc-dev 2023-05-04 08:57:26 +00:00
danielwbhuang
55a3d089f9 Fix Multiple UI issues 
1. Use edge-to-edge UI
2. Use new color token
3. Put text in the middle of the button

Bug:279163958
Bug:278504911

Test: manual
Change-Id: I189e9da2251f7d204ddc18680d3d1ec4638fa2db
 2023-05-04 08:56:41 +00:00
Treehugger Robot
8ec94497d9 Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae am: 69dcb19d2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: I6a6847b98fa774efc3d3977d50512e446beb38c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 20:22:16 +00:00
Derek Jedral
5a75cd54d4 Change preference title if Active Unlock enabled 
Change the title of the preference to reflect that Active Unlock can
also be used to unlock the device.

Test: make RunSettingsRoboTests
Bug: b/271782800
Change-Id: Ie227e6dddfc024235fc3568899ef151f14f17696
 2023-05-03 12:37:01 -07:00
Treehugger Robot
c3d6820ffd Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: Id1f507633ad33b5b0719dba4bc507e73ce7832e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 19:36:46 +00:00
Treehugger Robot
7244f3a0ae Merge "Update auto_rotate_summary string for different product" into udc-dev 2023-05-03 19:09:07 +00:00
Patty Huang
f05615f1e8 Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details 
Bug: 280020008
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: I559f34f2b0764c4f566fe1e0c1357929e2c88fb6
 2023-05-04 01:26:15 +08:00
Jigar Thakkar
0e8b8ec57f Modify clone profile accounts info section 
This change renames clone profile accounts header on the account
management dashboard to "Clone" from "Personal" by using the newly added
clone category header config. This also includes changes to remove the
add account preference from the clone profile accounts.

Bug: 260181765
Test: Flashed on a sunfish device and tested

Change-Id: Iff8b75119d85d2cd8ab065ed1057fb2b35e64650
 2023-05-03 14:20:48 +00:00
Edgar Wang
e416e27543 Update auto_rotate_summary string for different product 
Bug: 279769863
Test: presubmit
Change-Id: I98ceddc54bf5ea27cf862e96fe6358b3b885db0b
 2023-05-03 17:44:42 +08:00
Diya Bera
471fa2f0df Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: 47ccf9d776 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: Ic8caf36e5e2e0124fc8658c2b9a92e0c2a874c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:50:08 +00:00
Becca Hughes
428811be05 Fork autofill default app selection am: ddf359d0f8 am: 270b54d8a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I63239ddc7d287a32afc9b686fe83d1aefef8587b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:49:18 +00:00
Diya Bera
eb63f480cc Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I97f9fe6b4e4fc3abaeff42490b32008c760cb29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 22:48:27 +00:00
Becca Hughes
02e4e1d05f Fork autofill default app selection am: ddf359d0f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Ibf684e0c968d8dfa39f3fa5a74929c0acf0bbd8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 22:47:39 +00:00
Diya Bera
7dd5f5e156 Merge "Remove "Try again" from fingerprint error dialog" into udc-dev 2023-05-02 22:34:09 +00:00
Becca Hughes
ddf359d0f8 Fork autofill default app selection 
We are merging the default app selection for autofill
with credman so this forks the existing UI (so we can
flag it off).

Test: ondevice
Bug: 278919696
Change-Id: I96bcf1ff86b169a182b9974f7384c45b474c3d5d
 2023-05-02 20:31:14 +00:00
Diya Bera
9814931fd8 Remove "Try again" from fingerprint error dialog 
Test: Manual (Start enrollment and don't complete it for 10 minutes;
observe the dialog; screenshot in bug)
Bug: 279648300

Change-Id: I88280e3a5d47735285d89174ad8bcb0da8d39282
 2023-05-02 09:51:36 -07:00
Treehugger Robot
fa4f628318 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 7dfd217c1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I3b39848e791168df59d4f2203f59ae14728069df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 04:36:52 +00:00
Treehugger Robot
c1a32a5a7f Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I553d2a4be15286ec59f6fb38b188f4878c0e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 03:57:09 +00:00
Treehugger Robot
24666c9737 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev 2023-04-29 03:21:56 +00:00
Yuxin Hu
25b270c0f8 Add developer option switch to set ANGLE as the default system driver 
This change adds a new developer option switch called
"Enable ANGLE". It defaults to off. User can choose
to toggle it on and off, and the value of the system
property "persist.graphics.egl" is changed accordingly:

switch off: persist.graphics.egl=""
switch on: persist.graphics.egl="angle"

When user toggles the switch, a reboot window is
popped up asking user to reboot now to make the change
takes effect. If user chooses to cancel the reboot,
the switch is toggled back. This enforces that a reboot
is required whenever the "persis.graphics.egl" value
changes.

Upon reboot, we will load either ANGLE or native
GLES driver as the system driver, based on the value of
"persist.graphics.egl".

The switch is disabled if ANGLE is not installed
in /vendor partition. We use the system property
"ro.gfx.angle.supported" as an indicator. We set the
two conditions together in angle.mk file. Any device
mk file that inherits angle.mk file will result in
ANGLE libs installed in /vendor and "ro.gfx.angle.supported"
set to true.

Bug: b/270994705
Test: m; flash and check Pixel 7 boots fine
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest

Change-Id: I565eff614472bb6ba50742e7dfa49b50dca2809f
 2023-04-28 18:42:10 +00:00
Julia Tuttle
ff3d30a9b4 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: ce59e1ea97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: I7733171ec9db9f522bba6dad727cb766f178d4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 21:34:15 +00:00
Julia Tuttle
4792f21e3d Merge "Update FSI permission strings" into udc-dev am: 2094622da9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Ib02eef795ee140bb9241dadfb25749937fb8a774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:48:04 +00:00
Julia Tuttle
2094622da9 Merge "Update FSI permission strings" into udc-dev 2023-04-27 20:03:56 +00:00