Commit Graph

94213 Commits

Author SHA1 Message Date
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
e36aa5bc78 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: I703428689f3ab259c89c88a0e726f724ecb030a5
2021-08-13 01:00:47 +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
Joshua
7b2293ef9a Parse AM Constants to get keys:value for Dialog
Takes the AlarmManager csv string and parsees it for key:value
pairs. These key value pairs are then used to fill in information that
the DialogFragment class needs to display information. An ArrayMap is
used to initialize and store a key and the values associated with it
through a data object class. This data can be retrived in updated by
providing only a key.

Bug: 195056296
Bug: 195056102
Bug: 195055428

Test: Manual
Change-Id: Ia11f41bdd1790f7f3483d33148c251c58243e890
2021-08-13 00:12:24 +00:00
Joe Bolinger
2296f618cc Add biometric OWNERS to unit tests.
Fix: 196452210
Test: N/A
Change-Id: I6f76bef97dd61130dd546749591338864665352b
2021-08-12 16:17:03 -07: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
TreeHugger Robot
1d441b72c5 Merge "Update UI when TARE settings revert to default" 2021-08-12 22:52:55 +00:00
Julia Reynolds
2ffbb747d4 Handle spanned conversation labels
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
2021-08-12 20:11:00 +00:00
Roshan Pius
2f28d8e3d0 Merge "Revert "UWB: Re-enable UWB toggle"" 2021-08-12 19:46:20 +00:00
Joshua Duong
fd009229e5 Fix QR code scanner layout in "Pair devices over Wi-Fi" page.
The toolbar needs to be disabled to remove the empty space at the top
of the page. Also added the landscape layout xml.

Bug: 193602141
Test: atest SettingsUnitTests and manual

Change-Id: I30368835979b360a8f09e16f70adf57064784517
2021-08-12 18:44:15 +00:00
Roshan Pius
2e593b3784 Revert "UWB: Re-enable UWB toggle"
This reverts commit 7437b1f07e.

Reason for revert: Reverting until root cause of b/196317865 is identified.

Bug: b/196317865
Test: Compiles
Change-Id: I6dfed998c4387a54dac8d41ed65c5a30752ed290
2021-08-12 17:05:18 +00:00
Weng Su
7e14668094 Don't show Wi-Fi icon if the level is -1
Bug: 195893448
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Change-Id: Ifddc9aace42d1f024b7c861b1207f651061d790b
2021-08-12 23:04:31 +08: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
TreeHugger Robot
0bf6164584 Merge "[Settings] WFC preference will be grey out after disconnecting the call" 2021-08-12 10:52:24 +00:00
YUKAI HUNG
25a6752ac7 Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c am: cdc43dfc73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530296

Change-Id: I6c7be98e5752bcdfffb00b94333ed052ac2f9f9e
2021-08-12 07:31:13 +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
707b73ea36 Merge "[Robustness] protect get battery stats from DeadSystemException" into sc-v2-dev am: 3eddc31560 am: 78be413280
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15527095

Change-Id: I98038e83cbb7c96157265e1edcfd2c7705f4c931
2021-08-12 07:08:00 +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
YUKAI HUNG
3eddc31560 Merge "[Robustness] protect get battery stats from DeadSystemException" into sc-v2-dev 2021-08-12 06:45:21 +00:00
YUKAI HUNG
50ecf12ece Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev am: d7bf769cc4 am: cc29f09349
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530295

Change-Id: I76802169c0f1a555862c4447b16c8b2a7355d30b
2021-08-12 06:10:24 +00:00
YUKAI HUNG
cc29f09349 Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev am: d7bf769cc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530295

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

Change-Id: Ic8f5ee6abc79ea05d1b8b822ff652c466c8a9135
2021-08-12 05:45:45 +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
YUKAI HUNG
d7bf769cc4 Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev 2021-08-12 05:05:06 +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
004f5168d4 Merge "Add owner to the connected device folder" am: 6cbb4dfbe1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: I49a8ef27a0a7d45bd8e03666eee28db19fac2977
2021-08-12 04:41:10 +00:00
Treehugger Robot
6cbb4dfbe1 Merge "Add owner to the connected device folder" 2021-08-12 04:23:29 +00:00
Wendy Sung
91f0c5938b Fix typo for Illustration Preference (picked from Wendy's patch)
Test: Manual Build
Bug: 194819372
Change-Id: Idbc6891dc1139227e5fb5585e2aadb717d5d6205
2021-08-12 04:01:17 +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
TreeHugger Robot
5bef3f74f9 Merge "Fix USB tethering is not turned on with a single tap" 2021-08-12 03:52:32 +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
Zoey Chen
9af602b3ad [Settings] WFC preference will be grey out after disconnecting the call
Bug: 186369342
Test: manual
Change-Id: I1e15b72110ee86d90e50a47026f11c19a2e15f85
2021-08-12 10:24:13 +08:00
Kevin Chyn
bb465ea420 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: c97269a900 am: 7863a996a7 am: 06d93c0a6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: Ice88d7282b6998b162e1c95e76420c2ecba9b772
2021-08-12 02:01:46 +00:00
Kevin Chyn
8b662d0c33 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: c97269a900 am: 583301e49f am: 5ddfd29c79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: Ic59bde6d78b24a9a4ed3e9642919394c1d9a7f7c
2021-08-12 02:01:24 +00:00
Kevin Chyn
f013457b4c Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: 26d1877a7b am: 4cf058b144 am: 29f8d4ddef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: I166ca7ef41b3d8456e3b6b0bb6469f9cb99cd585
2021-08-12 02:01:09 +00:00
Kevin Chyn
fb5f9df066 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: 75725902d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: I242c5c9c57cdf61085b4b3e6066fa8544d37ca71
2021-08-12 01:50:39 +00:00
Kevin Chyn
06d93c0a6c Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: c97269a900 am: 7863a996a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: I27d66045f009bdc5da681136cb7436f71d59065f
2021-08-12 01:47:24 +00:00
Kevin Chyn
5ddfd29c79 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 am: c97269a900 am: 583301e49f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: I7831cf5980ab30d4bbd2636e7e039a8169846174
2021-08-12 01:47:02 +00: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
583301e49f 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: I330f953a42777b7e9cf848a3c3446e9ac18b2c47
2021-08-12 01:26:27 +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