Commit Graph

44590 Commits

Author SHA1 Message Date
Jason Chiu
b9b1225ac3 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev 2022-11-08 04:34:19 +00:00
TreeHugger Robot
a6e8ddda16 Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev 2022-11-08 03:34:11 +00:00
TreeHugger Robot
fec63bdb5b Merge "Clean bluetooth code" into tm-qpr-dev am: 19278b9477
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20377860

Change-Id: I68469b235bf57c254cfc9d5aaa8580e4f1abd141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 03:20:12 +00:00
TreeHugger Robot
19278b9477 Merge "Clean bluetooth code" into tm-qpr-dev 2022-11-08 02:37:30 +00:00
Jason Chiu
fb95451369 Reserve the icon space to avoid preference padding change
If the injection icon is to be retrieved from a provider, the preset
transparent drawable is a 1x1 icon, which may cause the preference
padding change before and after the injection icon reloading.

Bug: 253471066
Test: robotest, visual
Change-Id: Ie88f69bb047a64a6a0ee30c060d8cbb8fe27b3d7
2022-11-07 10:11:20 +00:00
Tsung-Mao Fang
70b8bd92c9 Fix NPE crash in TextToSpeechSettings
Recyclerview's getItemAnimator() is nullable so we need a null check.

Bug: 254330134
Test: Manual
Change-Id: Iba5b0d68740c430fd1143d38ccf344afef486784
Merged-In: fa6a8e9767
2022-11-07 05:43:40 +00:00
Bonian Chen
af96b1ea7a Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
15f0cd6428 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
ab2e7bf6a5 Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
0eab03a862 Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
0b80576a34 Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
3423f0cb9b Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Arc Wang
c8fd92dc66 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: 5292e9e085 am: 76f12ccdca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I695908089058699e6cea14385c4261a69e821159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 06:23:27 +00:00
Arc Wang
76f12ccdca Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: 5292e9e085
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: Icb4fc96a1fe5903b7d09157d552c6782b6db2036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:56:25 +00:00
Arc Wang
5292e9e085 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I66b28ac40ee6c50c10e51cff6844c17f91ac5e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:26:26 +00:00
Arc Wang
923ba5fcb2 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I766b9fa3ccd6c7d690275292b84efbddb19c651e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 04:23:18 +00:00
Joshua Mccloskey
bd91183ac8 Merge "Added intro lottie for foldable." into tm-qpr-dev am: bc38bacaf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20347039

Change-Id: I8d4a7381084408dbe2e9b670e251670c7b50e7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 18:56:24 +00:00
Joshua Mccloskey
bc38bacaf2 Merge "Added intro lottie for foldable." into tm-qpr-dev 2022-11-04 18:25:47 +00:00
TreeHugger Robot
56f9461b45 Merge "Crop avatar to circle when syncing from Contacts." into tm-qpr-dev am: 057d24bb97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20347031

Change-Id: I67ce42b02907e02eda847497e37cb1aaa962e2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 17:07:58 +00:00
TreeHugger Robot
057d24bb97 Merge "Crop avatar to circle when syncing from Contacts." into tm-qpr-dev 2022-11-04 16:27:21 +00:00
Bonian Chen
bf55048799 [Settings][Back port] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Change-Id: I709a8007362b09dbb1ec1bd5d32c68d23ed0cfa9
(cherry picked from commit 2b048b22f0)
2022-11-04 07:06:23 +00:00
Wesley Wang
8deb159e35 Fix app battery usage list launch incorrect works app
- App usage page only use package name to launch the page, it can not
   identify the different userId between normal app and work profile
   app, add extra userId info into launch args
 - Remove no battery usage state/string if usage time is empty

Bug: 251471047
Test: make SettingsRoboTests
Change-Id: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
Merged-In: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
2022-11-04 06:05:55 +00:00
William Escande
dabdd6faa9 Merge "Fetch currently loaded bluetooth name" into tm-qpr-dev am: a364c8bacb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378665

Change-Id: Id9ddd49d48825e90f8414360363ad85a0a5068cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 04:55:28 +00:00
William Escande
24278d1609 Clean bluetooth code
Fixing nit from Ib40a6264d8d6908103d76b6401ddcfd3ffa7dd88

Test: m ROBOTEST_FILTER="com.android.settings.bluetooth" RunSettingsRoboTests
Test: Open developer settings
Bug: 257158801
Change-Id: Id3521c423e5ab751633df627d113206f374fbe8e
2022-11-03 21:31:17 -07:00
William Escande
a364c8bacb Merge "Fetch currently loaded bluetooth name" into tm-qpr-dev 2022-11-04 04:27:18 +00:00
William Escande
723df89aaa Fetch currently loaded bluetooth name
Test: m
ROBOTEST_FILTER="BluetoothMaxConnectedAudioDevicesPreferenceControllerTest"
RunSettingsRoboTests -j40

Test: m ROBOTEST_FILTER="com.android.settings.bluetooth" RunSettingsRoboTests
Test: Open developer settings
Bug: 257158801
Change-Id: Ib40a6264d8d6908103d76b6401ddcfd3ffa7dd88
2022-11-04 03:05:41 +00:00
Joshua McCloskey
67c6ec3ef4 Added intro lottie for foldable.
Test: Verified lotties during fingerpritn enrollment flow.
Fixes: 246684274
Change-Id: Ic9e95dd650dd5018d13751d251fdac53e1fb13d0
Merged-In: Ic9e95dd650dd5018d13751d251fdac53e1fb13d0
2022-11-04 02:57:38 +00:00
Joshua Mccloskey
6a5d3528d6 Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev am: c4e603688e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378667

Change-Id: Ia13069fcb0141a4f92fff8c1fd203302c059063f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 01:24:54 +00:00
Diya Bera
1181760b86 Remove "require screen on to auth" preference for Udfps
Fixes: 257272989
Test: N/A
Change-Id: Ic10bd02c7a26e58abcb471c3f495d65247f29edc
2022-11-03 22:29:10 +00:00
Behnam Heydarshahi
6b156be280 Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: I7321b1bfe1e7d89924b38cd6adf2853d336740d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 16:15:00 +00:00
Behnam Heydarshahi
2552ae08ae Merge "Read flag to show/hide notification slider" into tm-qpr-dev 2022-11-03 15:57:37 +00:00
Joshua Mccloskey
4033cc7d0e Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190

Change-Id: I7f485c93b429fc2d2f75b1fc3e46d82a47e31c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 02:39:08 +00:00
Joshua Mccloskey
db266ca6b2 Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev 2022-11-03 01:56:52 +00:00
Oli Lan
e402603084 Crop avatar to circle when syncing from Contacts.
This ensures that photos synced to the Android user icon from the
Me Contact, by the ProfileUpdateReceiver, are cropped to a circle.

This matches the behaviour when images are selected using the
avatar picker.

Bug: 256827004
Test: Manual, build & flash, sync photo, observe in lockscreen.
Change-Id: If1abf110b74a3892a5cfb76ee344be79c867feed
2022-11-02 16:26:58 +00:00
Grace Cheng
13d3bdc4c0 Implement SFPS “require screen on to auth”
Creates new setting on SFPS to require screen on before unlocking a
device. Also sets up toggles for this setting at the end of fingerprint
enrollment and on the fingerprint settings page, and adds tests to
verify expected behavior.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Fixes: 249169615
Fixes: 245343077
Fixes: 248530806
Change-Id: Id588796426d071860b3cc2af9ec5798c0027c202
Merged-In: Ia44604b059c4847c40608419b2e16219976ced3e
2022-11-02 14:34:59 +00:00
Arc Wang
4cfe8b8204 Merge "Extend SearchView width" into tm-qpr-dev am: 049deec9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20337665

Change-Id: I2f7807561257dc18be802f0acc90cce56ca71b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 08:07:13 +00:00
Arc Wang
dd7d2d766a Remove Intent selector from 2-pane deep link Intent
To guard against the arbitrary Intent injection through Selector.

Bug: 246300272
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I76fbf3ff7a6611ebb3d07f73845a64efe1771769
Merged-In: I8b3b936de490f09f4be960fdafc6e66a1d858ee2
2022-11-02 07:38:18 +00:00
Arc Wang
049deec9b5 Merge "Extend SearchView width" into tm-qpr-dev 2022-11-02 07:22:13 +00:00
TreeHugger Robot
34471a7160 Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947

Change-Id: Id9e378514d71beef1a4dcb9ab0c96053dabe254f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 00:03:28 +00:00
TreeHugger Robot
d2635580fb Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev 2022-11-01 23:21:35 +00:00
Behnam Heydarshahi
2ac6fc5709 Read flag to show/hide notification slider
Replace the build-time boolean resource with a run time device config flag that
signals whether the ring notification slider should be displayed or not

Bug: b/38477228
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932
2022-11-01 20:31:38 +00:00
Yining Liu
52ea5d8b7c Increase the number of notification items that can be shown in Notification history - Recently dismissed
Increase the max number of items shown in 'Notification history - Recently dismissed' from 6 to 50.

Bug: 255784319
Test: Manual: Dismiss 6 or more notifications, open Settings-Notifications-Notification History, the max item count under `Recently dismissed` should be 50.
Change-Id: Ia13158ae1ebca448d43bf4c6f6037758b3f40615
2022-11-01 20:20:41 +00:00
Gil Cukierman
58d85e3383 Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae am: 27217b87a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: I5b61fd4c84e9ea881f786355c9649bd744d46ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 15:02:30 +00:00
Gil Cukierman
27217b87a9 Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: I17e4dc0b5dfdfd55a866b641af560b4dccba1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 14:21:52 +00:00
Gil Cukierman
08d03390ae Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" 2022-11-01 13:51:58 +00:00
Arc Wang
0243771025 Extend SearchView width
To align SearchView x button with right border.

Bug: 254403811
Test: manual,
      Settings > Apps > See all apps > tap the search icon >
      input something and observe.
Change-Id: I5146c9ffb3c5177926e75f673497408092f6c065
2022-11-01 10:26:17 +00:00
Arc Wang
67dc170d66 [Activity embedding] Fix unexpected finished 2nd layer problem am: 9e207bfcd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309891

Change-Id: I0ed23ce19ce4dca5308ecae20e891f4476738258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 02:54:36 +00:00
Bonian Chen
887152470e [Settings] configuration for hidding SIM notification UI
Hide SIM notification UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Change-Id: I7a912a3393694155d29614d325796e08598985bf
2022-11-01 01:56:55 +00:00
Bonian Chen
ec5b595862 [Settings][Back port] configuration for hidding SIM settings UI
Hide SIM settings UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Change-Id: I32169dc7d21164ca40297e75ca9122ecb9ade039
2022-11-01 01:56:44 +00:00
Bonian Chen
6b8ea62392 [Settings][Back port] configuration for hidding SIM lock UI
Hide SIM lock UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Change-Id: I03861e53c600e2a19c634700360811fbc01b8a60
2022-11-01 01:56:25 +00:00