Commit Graph

110521 Commits

Author SHA1 Message Date
TreeHugger Robot
9b1ccbcb74 Merge "Guard FallbackHome activity behind permission" into tm-qpr-dev am: 7b63700b0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064643

Change-Id: I944eaa6f1f6b166a5641d77209e92edd3aa3d71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 03:25:20 +00:00
TreeHugger Robot
7b63700b0b Merge "Guard FallbackHome activity behind permission" into tm-qpr-dev 2022-11-04 03:00:05 +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
Joshua McCloskey
e3162c2a6b Updated sfps screen auth toggle. am: 7b58cadcfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378668

Change-Id: I5df9568f472562bdb2f80c36eb777913ce31323f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 01:24:43 +00:00
Joshua Mccloskey
c4e603688e Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev 2022-11-04 01:01:26 +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
Joshua McCloskey
7b58cadcfc Updated sfps screen auth toggle.
Test: Verified toggle is on top of icon during fingerprint setup.
Fixes: 254923267
Change-Id: Id2f6444646201b6e4eca0c563984527776227ebb
2022-11-03 22:22:09 +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
Shaowei Shen
bae059a834 Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev am: 7ebdcf7b14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20288323

Change-Id: Ie07cd8e98461f59d1b9541591ee6f638f8579661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 02:42:26 +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
Shaowei Shen
7ebdcf7b14 Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev 2022-11-03 02:18:52 +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
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
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
Bill Yi
4335d93892 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1fa98709be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767

Change-Id: I31e950b25b477b81ed5d510597b06bd335dd3054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 15:10:47 +00:00
Bill Yi
11b74c81fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4782603e13 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767

Change-Id: I60a0830bb1cfc8caff841c19105202bdfd83c602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 15:10:30 +00:00
Bill Yi
d67c9cae5b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6f153936fd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308754

Change-Id: I6d918b4a236691ef4e3aafd344fcdcf38222def4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 15:10:16 +00:00
Bill Yi
436cfce33f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c959a23a41 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308754

Change-Id: I45dbc6d0a51e14394f8a1cd8651c9412e73900ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 15:10:01 +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
Bill Yi
1fa98709be Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-01 14:40:15 +00:00
Bill Yi
6f153936fd Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-01 14:40:15 +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
Treehugger Robot
778ef161bb Merge "Fix errorprone warnings that should be errors" am: 5744d7c560 am: 7094507528
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I369fd8dc4e2cec46ffd4e61a32e7e55cb11b41a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 23:24:11 +00:00
Treehugger Robot
7094507528 Merge "Fix errorprone warnings that should be errors" am: 5744d7c560
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I65ce6c4fdedd32ff6feb4b5e210b508aafc4e589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 22:57:02 +00:00
Treehugger Robot
5744d7c560 Merge "Fix errorprone warnings that should be errors" 2022-10-31 22:21:12 +00:00
Bonian Chen
525529c137 Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
e3b5bda8aa Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
f192a07988 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
c5bd2f425b Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
4c06b549bf Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
a81f71ae46 Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Arc Wang
9e207bfcd0 [Activity embedding] Fix unexpected finished 2nd layer problem
If Settings is started on an existing task, the existing SplitPairRule
may cause an unexpected app finish while navigating back from the
2nd layer page.

This change resets SplitPairRule in onNewIntent().

Bug: 247080168
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
      manual
      1. Settings app -> 'Connexted device'.
      2. Launch Settings app again from Settings icon in quick Settings.
      3. Start a 3rd layer from 'Network & internet'
      4. Click back and see if the 2nd lay shows.
Change-Id: I262327cc49c3a4434a183eb00ac57f47fa598f70
Merged-In: I262327cc49c3a4434a183eb00ac57f47fa598f70
2022-10-31 21:33:02 +08:00
TreeHugger Robot
dada288047 Merge "Use correct menu key highlights for safety center" into tm-qpr-dev am: b0f38d29d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209766

Change-Id: I33446534e0f76df00fe3e5fad0e8ac135afafc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 10:54:00 +00:00
TreeHugger Robot
b0f38d29d2 Merge "Use correct menu key highlights for safety center" into tm-qpr-dev 2022-10-31 10:04:02 +00:00
Weng Su
950837b20f Disallow screenshot on Wi-Fi QR code settings
- Add FLAG_SECURE to WifiDppConfiguratorActivity to avoid screenshot security issue

Bug: 249980936
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppConfiguratorActivityTest

Change-Id: I5e62c2584122f79127ab505e8491565e163de296
2022-10-31 08:59:40 +00:00
TreeHugger Robot
3ed6cb001b Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev am: 3cb39ca221
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20252603

Change-Id: I78447f80bd4971eeb67395107a3731ccbcc18f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 08:53:45 +00:00
TreeHugger Robot
155beb0610 Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev am: 58292e7058
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307409

Change-Id: I87b186f17e8126638d5d09d6e9970b590d12ff6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 08:51:31 +00:00
TreeHugger Robot
3cb39ca221 Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev 2022-10-31 08:48:43 +00:00
TreeHugger Robot
58292e7058 Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev 2022-10-31 08:10:57 +00:00
Bonian Chen
b4a8672dd9 [Settings][Back port] configuration for hidding SIM settings UI
Hide SIM settings UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Merged-In: I3d8b9b02998f09122a63f2262817acff3ca84d2e
Change-Id: I32169dc7d21164ca40297e75ca9122ecb9ade039
2022-10-31 07:09:37 +00:00
Lucas Silva
0e7f4d87ce Update the "When to dream" settings am: 47d84b41ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20302008

Change-Id: Id0ae8f8af81ab9cea7e61b1050e077afbe51a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 20:34:09 +00:00
Lucas Silva
47d84b41ac Update the "When to dream" settings
For devices which don't support dreaming on battery, we can offer
simpler options since the device must always be charging for
screensavers to appear. Therefore there are only two options:

1. While charging
2. While docked and charging

Test: flashed and verified on device
Test: make -j64 RunSettingsRoboTests
Fixes: 226187572
Change-Id: I6ed24cda8874f2fb941f6cfded9ed97ed78a3cb6
2022-10-28 13:07:36 -04:00