PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,988 Commits 1 Branch 0 Tags
1fe622ea84bec9cb02cce02be9da1f0669485e9c
Commit Graph

83988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
1fe622ea84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 15bb8d9aae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40521b8ab455a2c08736f6c733eb269000b2611a
 2021-08-13 19:44:39 +00:00
Bill Yi
15bb8d9aae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib46ff621c7f360961004af6281f08e3ced8acc59
 2021-08-13 19:32:41 +00:00
Bill Yi
04c33bbf71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic593602b09a52dc77d36de8f7f7133668fc0182a
 2021-08-13 19:17:59 +00:00
TreeHugger Robot
5af512fa91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: cc5b59c9a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie77229885fbe65b914ffe2a986d93256bee5279d
 2021-08-13 19:15:06 +00:00
TreeHugger Robot
40094149eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 7508bd0cd2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I312447fd21b55256cd33eda8640e7e23357a04f8
 2021-08-13 19:13:37 +00:00
TreeHugger Robot
1add1250a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 96bd289bf7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I412835c767934fb8f9f5dd406249edaa32ddfc4c
 2021-08-13 19:12:21 +00:00
TreeHugger Robot
cc5b59c9a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43fffed8c0c65794a17abeaea2a64e76a318000e
 2021-08-13 18:56:01 +00:00
TreeHugger Robot
7508bd0cd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fcd4bde39ddac78133671de50de523056314084
 2021-08-13 18:55:57 +00:00
TreeHugger Robot
96bd289bf7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I947c5595859294f600c17d4d3286769211f2e7a3
 2021-08-13 18:54:45 +00:00
TreeHugger Robot
737f4d76c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:45:05 +00:00
TreeHugger Robot
e5bdfacb0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: de4d5cb3f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3feefe86f4c68e4347e7b6b4a9d3dce52e1cc10
 2021-08-13 18:40:06 +00:00
TreeHugger Robot
b75551a41c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:39:35 +00:00
Bill Yi
4310165e62 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 4a7acc1636 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4bf87dc21cbf54df06681ed964032e1bf5a6076
 2021-08-13 18:39:31 +00:00
TreeHugger Robot
de4d5cb3f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31207099de86903024e9d1b4a7e272e312a5cfcf
 2021-08-13 18:22:30 +00:00
Bill Yi
4a7acc1636 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9390d5d0ecc35c365747ecead6f3cb48ff8eb95
 2021-08-13 18:22:28 +00:00
TreeHugger Robot
ede03fcc17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
 2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
 2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 17:59:41 +00:00
TreeHugger Robot
e4e2fb715f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-13 17:54:53 +00:00
TreeHugger Robot
fa782b4578 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-13 17:47:46 +00: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
Bill Yi
d486302dc9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
 2021-08-13 03:48:58 +00:00
Bill Yi
ec12fdf789 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28896b0ff317484fc7b22d7152bd99720b247df9
 2021-08-13 03:46:10 +00:00
Bill Yi
f30152962c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
 2021-08-13 03:42:27 +00:00
Bill Yi
a89104fd31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I52b666d62c7fa29e7b98ef5648952726ef34f1c8
 2021-08-13 03:34:34 +00:00
Bill Yi
d9ba125bb8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
 2021-08-13 03:32:57 +00:00
Bill Yi
dff93bb6b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42ad0edeea635e7c8c12ebffad01b2e0d6bba1a8
 2021-08-13 03:28:24 +00:00
Bill Yi
d54aa0fb4c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id8e88bc2762dcd1996cbaa52d7ac66d58320bfc9
 2021-08-13 03:24:52 +00:00
Bill Yi
ca003ac628 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7b8e508353852d4626453b56e71f222ab40c7f6f
 2021-08-13 03:13:32 +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
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
d7bf769cc4 Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev 2021-08-12 05:05:06 +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
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
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