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

86831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f13d3514ec [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iee4e7722d362e9bde4b19e403cb5bdcdb84d5931
 2021-08-13 03:42:40 +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
db32ad43da [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1716107ca1ede70291c80c65f838c80106296a80
 2021-08-13 03:33:05 +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
Bill Yi
914383ee99 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia4a9c0e4621a7a13ac202564ae83d45a44a94517
 2021-08-13 03:08:13 +00:00
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
6b6d641f21 Do not show work profile strings for parent-managed enrollment am: 570540b15c am: a92e3d9a03 am: 9e7a7cc40e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I79eb30cd8404fe6838f3d761bcfc11155f1c0b3c
 2021-08-13 02:56:01 +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
3872ed4b8c 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: Icd38b59e5a51d273bc767b2b135e9d996a41f77b
 2021-08-13 01:16:46 +00:00
Kevin Chyn
bf8ad9f293 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: Ieb43218dd4ab0b2e32607ac0df6ee14d827851bb
 2021-08-13 01:16:38 +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
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