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

86899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
58dcefef22 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: f1772f686b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Iba1b42b2e38903fcff5be73b894d047a94d9bdf2
 2021-08-13 15:21:14 +00:00
Alfred Lin
7f8e775754 Prototyping : Demo Image on color setting 
Implement prototyping of demo image on color setting

Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
 2021-08-13 15:08:58 +00:00
ykhung
96e9685687 Add a skeleton to support battery configucation backup/restore 
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I559eed40b05b73e7af5e091115afb11c4ba51068
 2021-08-13 20:25:09 +08:00
Joe Bolinger
86aebc1ea3 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90 am: 725619f6a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I01a99168f28500597ec4f43175b3f91355c6fac0
 2021-08-13 11:41:44 +00:00
Tsung-Mao Fang
74b1a46cb1 Move Automatic System Updates from Developer Options to System 
- Move the preference to the system xml file.
- DisableAutomaticUpdatesPreferenceController should not
inherit from the developer preference controller now since it's not used
in developer page anymore. Instead, just use toggle preference
controller for changing the state.
- Rewrite the test cases based on new controller.

Test: The ui works well and search can navigate to correct path.
Fix: 196001125
Change-Id: Iaea3e11d9cdbfa073ebd41bc3c84356d564c7e71
 2021-08-13 08:11:22 +00:00
TreeHugger Robot
fb60c7664f Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: 597ca951a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I5c096d2b447c8012dc7b7cd27598585651123e60
 2021-08-13 05:38:45 +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
597ca951a9 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: I31d94c633afda15f05d660e6854c2b6c552a6d7a
 2021-08-13 04:27:14 +00:00
TreeHugger Robot
1741d5d12c Merge "Handle spanned conversation labels" into sc-qpr1-dev 2021-08-13 04:11:04 +00:00
Joe Bolinger
d703385e2a Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90 am: 3872ed4b8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I43dd97bbb63d018fbefb187998e6a59c7000cbd5
 2021-08-13 03:56:35 +00:00
Kevin Chyn
e8b0c5e93c Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8 am: bf8ad9f293 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I6a81869653a56c3e0830865e1581662ba53a36f1
 2021-08-13 03:56:27 +00:00
Bill Yi
f13f8b9065 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 
Blank merge reason: commit message contains skip directive

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

Change-Id: I53d51fa42b4a0bd99c581205a438c09f75b24bf5
 2021-08-13 03:49:10 +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
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
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
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