Commit Graph

38630 Commits

Author SHA1 Message Date
Joe Bolinger
ba21ddcc35 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 74efeebf5c am: 0c8e25d2f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

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

Change-Id: I888bc6147611ce740472046327efe1b1a2b9c777
2021-08-13 01:26:53 +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
0c8e25d2f6 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 74efeebf5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

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

Change-Id: I6c26b77b1539be5ef128250f3bb82d731434ac3a
2021-08-13 01:15:52 +00:00
Joe Bolinger
74efeebf5c 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: I28682e9fbbbb6c83b08ef45f10fd923d156c7742
2021-08-13 01:14:44 +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
a92e3d9a03 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: I626b65d8db83f232ca4d173697dfb5d62e60d39d
2021-08-13 00:59:39 +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
Zoey Chen
95bcd7cb23 [Settings] Fix RTL issue of Calls and SMS
Screenshot: https://screenshot.googleplex.com/9BqEh99vz7xp2g4.png

Bug: 189300799
Test: make
Change-Id: I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa
(cherry picked from commit 54bd206fbc)
Merged-In: I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa
2021-08-12 13:47:21 +00:00
Zoey Chen
f982f286a2 [Povider Model] Fix string in SIMs
Bug: 192058192
Test: make
Change-Id: I4314802840a4952acf7f090d81ca19ec28b793b2
(cherry picked from commit 84073b9851)
Merged-In: I4314802840a4952acf7f090d81ca19ec28b793b2
2021-08-12 13:47:05 +00:00
YUKAI HUNG
cdc43dfc73 Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530296

Change-Id: I9551360d2c78279677efa94ae6cda28e98e04196
2021-08-12 07:17:48 +00:00
YUKAI HUNG
78be413280 Merge "[Robustness] protect get battery stats from DeadSystemException" into sc-v2-dev am: 3eddc31560
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15527095

Change-Id: I84d4c47386543e3f1d88663e1f3dfeca0668b317
2021-08-12 06:59:36 +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
Treehugger Robot
b41e35a304 Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 am: 004f5168d4 am: f5ddc8ffaa am: 79978071e2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: I6815488dcd2599c423d7f197fc93983ae5184793
2021-08-12 05:35:45 +00:00
Treehugger Robot
79978071e2 Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 am: 004f5168d4 am: f5ddc8ffaa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: I1d0d6dd5c519aa6931771135dbc13c51c82ce8c0
2021-08-12 05:07:07 +00:00
Treehugger Robot
f5ddc8ffaa Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 am: 004f5168d4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: Ic41c5d666d0740dc8a6f4bdbb9e644ad981adee1
2021-08-12 04:54:18 +00:00
Treehugger Robot
6cbb4dfbe1 Merge "Add owner to the connected device folder" 2021-08-12 04:23:29 +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
Hugh Chen
ddf63eac87 Add owner to the connected device folder
Bug: 196287361
Test: local test
Change-Id: Ib800955f04bbd6c23b9a1700faa918f8b1126d79
2021-08-12 11:16:18 +08:00
Kevin Chyn
29f8d4ddef Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: 26d1877a7b am: 4cf058b144
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: I410da5392b9bbdadf7e2fe0dea028d187b033bdd
2021-08-12 01:46:51 +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
4cf058b144 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: 26d1877a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: I5984a44ef7519066dfd3150576825df631866d4c
2021-08-12 01:25:34 +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
26d1877a7b Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
2021-08-12 01:10:01 +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
86887fcb9a Limit the number of concurrent notifs appear on screen am: abe9246caa am: 273df63430
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757

Change-Id: Ia192c759c3a982740fe2dcb9de9a6acdd55bfa44
2021-08-11 22:52:21 +00: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
273df63430 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: I686166bf858ec7fde221e76b28c8280decc9ec13
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
5fadabee0d Merge "Use NEW_TASK|CLEAR_TOP when launching emergency app" into sc-v2-dev am: f923361f32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505710

Change-Id: I4f4f23b869a204c8bfa0f4f8ce683ddbbe563285
2021-08-10 08:50:50 +00: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
e8d060a95a Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b am: 1d8c6a6188 am: 2c6cd5b6d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: Id942def631ce2476267040245196e258a84e6f3c
2021-08-10 06:35:22 +00:00
Tom Hsu
2c6cd5b6d1 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: Ia9625410ec4aadb5c5ad7111c2b50190819c5c86
2021-08-10 06:26:49 +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
e8b42fbf1b Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: I09932874d5c45b1570d0fd83a8f8b1aad4b43108
2021-08-10 06:12:23 +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
Treehugger Robot
deeda01639 Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa am: 1079d2160d am: 4d00d08afa am: 57fba3fd53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: I62e69b314022da7b731a0ce5ef3e8baccd7404a7
2021-08-10 03:50:20 +00:00
Treehugger Robot
4d00d08afa Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa am: 1079d2160d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: I2c4e3487ce8295d6058a096a446c0014080407c2
2021-08-10 03:19:55 +00:00
Curtis Belmonte
bc992403c9 Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 am: e2cecc12ce am: d03beb3b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: I08b9de996c24f81aa32dcdc22b2de7463e0e79e6
2021-08-10 00:45:53 +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
e2cecc12ce Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: Ide0d2b21c96a12f0a597ece182d5bf4631df4286
2021-08-10 00:17:34 +00:00