Commit Graph

37534 Commits

Author SHA1 Message Date
Calvin Pan
186ea2cd3b Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I78ee6b2fb68ba44682e33cc6dbaaee6a64cba608
2021-08-18 06:56:25 +00:00
Calvin Pan
abb8a6abdc Merge "Remove unnecessary condition" into sc-qpr1-dev 2021-08-18 06:43:59 +00:00
Jordan Jozwiak
5da0ca8a14 Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev 2021-08-17 21:40:30 +00:00
YUKAI HUNG
0a308d056b Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev 2021-08-17 17:10:26 +00:00
ykhung
518d6df4f4 [Security] resolve RequestIgnoreBatteryOptimizations info disclosure
after discussed with kdeus@ we will remove the setResult() from the
dialog action to avoid the caller apps can distinguish the users
interaction behavior, and declared REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
in other applications.

Bug: 195963373
Test: make SettingsRoboTests
Change-Id: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
2021-08-17 12:06:59 +08:00
PETER LIANG
4cddfd2b00 Merge changes I57306532,I1fba7ee1 into sc-v2-dev
* changes:
  Update the instruction images in Accessibility tutorial dialog.
  Update the instruction images in Accessibility edit shortcut dialog.
2021-08-17 03:00:28 +00:00
YUKAI HUNG
7053c5e265 Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev 2021-08-17 02:37:37 +00:00
Curtis Belmonte
4f1672ce7b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I8f77b33b4bcba08b8a25965cf165db290aaeca11
2021-08-17 01:15:50 +00:00
Curtis Belmonte
36a42b630b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ia1824f9bbb81d95e928f32f39f088a4a6aeaef9e
2021-08-17 01:02:08 +00:00
Curtis Belmonte
7fb2316a21 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev 2021-08-17 00:47:58 +00:00
Curtis Belmonte
dc9b53c446 Remove/replace old fingerprint icon in SUW/Settings
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.

Test: Manual

Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
Jordan Jozwiak
e6835713b6 Use refactored RecentAppOpsAccess
Use the new class in place of the old one.

Bug: 182202223
Test: atest RecentLocationAccessPreferenceControllerTest
Change-Id: If0222e79bf8ba2ebe2b1b0a8c043ce39f5a45596
2021-08-16 13:08:47 -07:00
Peter_Liang
192dfdec7f Update the instruction images in Accessibility tutorial dialog.
1. Update the material next style.
2. Support for Lottie image.

Bug: 195094388
Test: manual test
Change-Id: I57306532b10e91c927bdc1ef5e115f41bc7a939b
2021-08-16 16:20:01 +08:00
Peter_Liang
c2a04e3820 Update the instruction images in Accessibility edit shortcut dialog.
1. Update the material next style.
2. Support for Lottie image.

Bug: 195094388
Test: manual test
Change-Id: I1fba7ee1d18b53f4c917319d2c0a4a304de0ae43
2021-08-16 15:36:32 +08:00
TreeHugger Robot
e9f836a004 Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: Ic64df3fc905575608ec561ba9e8d2efb93fe0b7c
2021-08-14 07:26:54 +00:00
Alfred Lin
7f8e775754 Prototyping : Demo Image on color setting
Implement prototyping of demo image on color setting

Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
2021-08-13 15:08:58 +00:00
ykhung
96e9685687 Add a skeleton to support battery configucation backup/restore
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I559eed40b05b73e7af5e091115afb11c4ba51068
2021-08-13 20:25:09 +08:00
TreeHugger Robot
f1772f686b Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Id581e29e3b2ec42a93846d1878caf9bee334fa3b
2021-08-13 04:27:15 +00:00
TreeHugger Robot
1741d5d12c Merge "Handle spanned conversation labels" into sc-qpr1-dev 2021-08-13 04:11:04 +00:00
Joe Bolinger
725619f6a0 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I9531bd1ac329830db723ffbd28625592702c4a11
2021-08-13 01:21:35 +00:00
Joe Bolinger
2c0b7fdb90 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: Ia879a9fc3d00f2a04062d58df740fcb0c7281c93
2021-08-13 01:16:37 +00:00
Kevin Chyn
65f7fbcd8f Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I6ad451623bc795613b8e2ed4a77c81715969100f
2021-08-13 01:16:36 +00:00
Joe Bolinger
c78af9a272 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev 2021-08-13 01:08:16 +00:00
Kevin Chyn
61c508e0a8 Do not show work profile strings for parent-managed enrollment am: 570540b15c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: Icf7a5685809ee27143391ea9215de680b3b33094
2021-08-13 01:01:35 +00:00
Kevin Chyn
570540b15c Do not show work profile strings for parent-managed enrollment
Work profiles and parental management both utilize the
DevicePolicyManager KEYGUARD_DISABLE_* flags. This CL ensures that
work profile strings are only shown for work profiles, and not
parent-managed devices.

Bug: 196060286
Bug: 196443744
Test: Set up child account, then enroll from Settings > Security
Change-Id: Ib5ed1d63dd5d58ac64caf30010e340ac7784c38f
2021-08-12 15:56:38 -07:00
Julia Reynolds
2ffbb747d4 Handle spanned conversation labels
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
2021-08-12 20:11:00 +00:00
Calvin Pan
3bf80c66ff Remove unnecessary condition
The call forward timer is only valid for the CF_REASON_NO_REPLY reason,
and it will be 0 in other cases. Remove the condition to prevent disable
processing not working.

Bug: 194112447
Test: Build pass
Change-Id: I824a61383b595284ee5694fcd31e58e2379997fb
2021-08-12 14:05:37 +00:00
YUKAI HUNG
cb2ec5399c Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev 2021-08-12 06:46:26 +00:00
ykhung
fbbcc55fc0 Add time unit into battery usage chart and refine some UI
- add time unit into battery chart for 12/24 hours
- refine the radius size for chart bar
- use fixed font size for timestamp and percentage

screenshots:
24-hour format: https://screenshot.googleplex.com/3VNedE2nAx6LrXu
12-hour format: https://screenshot.googleplex.com/3tpTXjYfrasrenW
fixed-size: https://screenshot.googleplex.com/nPRKm7XCkmFzW6K

Bug: 194836607
Test: make SettingsRoboTests
Change-Id: I5b35b0fa808eb8a5f607962ee973c2896529b078
2021-08-12 03:59:39 +00:00
ykhung
ad346e12d5 [Robustness] protect get battery stats from DeadSystemException
In some corner cases, we will receive the DeadSystemException from
BatteryStatService when invoking getBatteryUsageStats() method. Before
this issue is resolved by BatteryStatService team, we will add some
protections to avoid Settings app is crashed.

Bug: 195306545
Bug: 195467687
Test: make SettingsRoboTests
Change-Id: I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47
2021-08-12 03:53:14 +00:00
Kevin Chyn
7863a996a7 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: c97269a900
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: Iad28764dd36dcc5da2d0938490f6970302224986
2021-08-12 01:26:19 +00:00
Kevin Chyn
c97269a900 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: Ib119a60b7538073218d8b77d06d071bc57fd7973
2021-08-12 01:10:53 +00:00
Kevin Chyn
715e337af8 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll
Bug: 196060286
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: Ib157dd916b1cfd2238cf6844a970d70cbf56faa6
2021-08-11 16:35:35 -07:00
Julia Reynolds
8c385c261c Limit the number of concurrent notifs appear on screen am: abe9246caa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757

Change-Id: Ie041911e9cba51365fc6c26e44f6cd3c3dce60bb
2021-08-11 22:31:14 +00:00
Julia Reynolds
abe9246caa Limit the number of concurrent notifs appear on screen
To avoid an ANR in notification history

Test: Manual; with an app with 10k recent notifications
Bug: 183712803
Change-Id: Ia1340accadf43620c7b5a2c94ca1032cfe49ea59
2021-08-11 20:22:53 +00:00
Joe Bolinger
9e9f1249d4 Refresh biometric preference controllers on lifecycle events.
Fix: 195961101
Test: make RunSettingsRoboTests
Test: manual (enroll via settings and verify preferences enabled after enrolling)

Change-Id: Ie50cd862a42c96eb95f2156a33f34748b2b8b50c
2021-08-10 13:29:05 -07:00
TreeHugger Robot
f923361f32 Merge "Use NEW_TASK|CLEAR_TOP when launching emergency app" into sc-v2-dev 2021-08-10 08:39:11 +00:00
Tom Hsu
0eb9547599 Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b am: 1d8c6a6188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: I01cc1d45fb1a630345a45116078838848d254076
2021-08-10 06:26:45 +00:00
Tom Hsu
939136b34b Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev 2021-08-10 06:00:44 +00:00
Tom Hsu
a17fc042dd Selects a active sim to MobileNetworkActivity w/o subscription ID input
Bug:194754151
Test: Sanity test with test build. See b/194754151#21

Change-Id: Ic3449392a7f564b69c3f42cc762ec4c9ec642797
2021-08-10 04:40:52 +00:00
Curtis Belmonte
2899c874f9 Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 am: 5968c28caf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: I6e7f9d3bbcc76d243713c10b87f4817ebf2118c4
2021-08-10 00:31:51 +00:00
Curtis Belmonte
4cb6d12b55 Merge "Make face education handle timeout result correctly" into sc-dev 2021-08-10 00:06:17 +00:00
Fan Zhang
2a3920e44d Use NEW_TASK|CLEAR_TOP when launching emergency app
This flag combination will attempt to go to the existing emergency app
task stack instead of creating duplicate ones.

Fix: 193108390
Test: manual
Change-Id: Ia9c9ead4e8b1d27582cdaff3e4d42c762e80709a
2021-08-09 22:54:21 +00:00
Curtis Belmonte
ea07bb8d2f Make face education handle timeout result correctly
Ensures that a result code of RESULT_TIMEOUT always causes the face
enroll education screen to finish and propagate the result.

Test: Lock and unlock screen at each stage of face enrollment

Fixes: 194857793
Change-Id: Ie4b09235f923c8a40de18878b0727f166112140f
2021-08-09 14:12:45 -07:00
Joe Bolinger
59f46b4385 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: fd115c5db2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I7b3af9b3a11572706110082206b7ec56883b06ce
2021-08-07 00:39:30 +00:00
Joe Bolinger
336d3e5501 Merge "Fix extra password confirm prompts during managed setup." into sc-dev 2021-08-07 00:07:22 +00:00
Bonian Chen
23f97347a3 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: Ia86d71fb7b70dc1ff9c6ff4d2b902b09baf736b2
2021-08-06 03:32:23 +00:00
Bonian Chen
68ac2d69c0 Merge "[Settings] eSIM existance detection rule change" into sc-dev 2021-08-06 03:15:49 +00:00
Beverly Tai
88364551db Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: Iff92c4d045ee1e6997109d5c475337ba4cbb7b00
2021-08-05 21:51:11 +00:00
Beverly Tai
60773b9a37 Merge "Use pattern subtitle string on all enroll stages" into sc-dev 2021-08-05 21:28:22 +00:00