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
87a7ebe1d9
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-08-13 19:08:56 +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
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
Zoey Chen
6ce608787b
[Provider Model] Redirect Settings Internet panel request to SystemUI.
...
From QPR, the panel should be launched from SystemUI, so redirect the panel to SystemUI
Test: make
Bug: 187779230
Change-Id: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
(cherry picked from commit ab8a922f77
)
Merged-In: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
2021-08-13 14:07:01 +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
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
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
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
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
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
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