PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,810 Commits 1 Branch 0 Tags
cd7094b9a92b80e6d9d116b0862aed7ab660c20c
Commit Graph

86810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Julia Reynolds
2ffbb747d4 Handle spanned conversation labels 
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
 2021-08-12 20:11:00 +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
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
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
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
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
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
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
Automerger Merge Worker
edddc0f3a2 Merge "Limit the number of concurrent notifs appear on screen am: abe9246caa am: 8c385c261c" into sc-v2-dev-plus-aosp 2021-08-11 22:52:26 +00:00
Julia Reynolds
03ecd3ca01 Limit the number of concurrent notifs appear on screen am: abe9246caa am: 8c385c261c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757

Change-Id: I4b188fe0813c63b46e86cd03ff1d2abbdb8fa12b
 2021-08-11 22:52:23 +00: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
Bill Yi
0b2493e964 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours am: ef23c240bb -s ours am: 229a3c6fd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib71cadece2ffa63190c693592bc56cfed7e706d5
 2021-08-11 02:22:07 +00:00
Bill Yi
b69c096e88 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours am: ef23c240bb -s ours am: 3fe3a3368a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4973f6c25105276696830c1bd8c5a248b31925b5
 2021-08-11 02:21:37 +00:00
Bill Yi
d53506d9c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours am: a882d0fb25 -s ours am: 428bc4eeb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc72ca9f2eeb3e9114af2b24a52e60c349f447f3
 2021-08-11 02:21:30 +00:00
Bill Yi
229a3c6fd5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours am: ef23c240bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5feb87eeed0629bc3c866c2ea0dd12605d185336
 2021-08-11 02:08:51 +00:00
Bill Yi
3fe3a3368a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours am: ef23c240bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia437c2785e9efb14c44bd869532962497f282ad1
 2021-08-11 02:08:47 +00:00
Bill Yi
428bc4eeb1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours am: a882d0fb25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6c4cd5d366619532f152e7f81b11ed9ab9ea2da
 2021-08-11 02:07:43 +00:00
Bill Yi
ef23c240bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e58552d5c13ac2af70eb4ad7ec20d799eac685f
 2021-08-11 01:53:42 +00:00
Bill Yi
a882d0fb25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c181cc60b8fc5aa80148e97de80d8af1939c8c4
 2021-08-11 01:52:50 +00:00
Bill Yi
4d8e7b1053 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iecc762cad3adca3df40bd806c0cfb194ca519a9f
 2021-08-11 01:41:07 +00:00
Bill Yi
d3f8a4fff3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6 -s ours am: bb0c70c0dd -s ours am: b7bd3b2b27 -s ours am: 38ee99244a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bb43dad72c4c7033206a80e42e6bf1ff1894398
 2021-08-10 21:12:30 +00:00
TreeHugger Robot
08f1fa968a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8 -s ours am: e0cc807a09 -s ours am: 2e00e26ac1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib40e5f71d5ba006b07399bf6833a7ff1ae869fd6
 2021-08-10 21:12:05 +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
Bill Yi
3dfe5536a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6 -s ours am: bb0c70c0dd -s ours am: 372cc737af -s ours am: 3a1bb9ed75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0cdc148bf85ee265e9956f19894bd6d7ca97f307
 2021-08-10 20:21:56 +00:00
TreeHugger Robot
2629d76a5f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8 -s ours am: c27e9b56fa -s ours am: 5a41d5afd4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6965c8ea2d551ce9fe8765615cf99b1ea3bc6911
 2021-08-10 20:21:13 +00:00
TreeHugger Robot
6761f41926 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9aa8b8906e -s ours am: 282a8c66c6 -s ours am: 898179e43e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e20374f6c528d218d9508712c0bc5aa50a537e2
 2021-08-10 20:20:35 +00:00