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
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
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
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
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
ed6ce603a0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6
-s ours am: bb0c70c0dd
-s ours am: b7bd3b2b27
-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: I84fec4f5dfe2077bf1a0b61f3e6b2f6aab265b03
2021-08-10 19:57:46 +00:00
TreeHugger Robot
89ba746260
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8
-s ours am: e0cc807a09
-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: I5d0eedd30e168d1750e520be1c0308e929abec63
2021-08-10 19:57:23 +00:00
TreeHugger Robot
247c17f9ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9aa8b8906e
-s ours am: 282a8c66c6
-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: Iecf89f3a3e9bdc05d582bbb1297d5e64d3b85892
2021-08-10 19:56:43 +00:00
Bill Yi
b7bd3b2b27
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6
-s ours am: bb0c70c0dd
-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: I20c34249b46bfad620489420f6c76890626ec98d
2021-08-10 19:40:11 +00:00
TreeHugger Robot
e0cc807a09
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8
-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: I3408bedc4ee206ceb22dca0a61e19fdd11b0294b
2021-08-10 19:39:58 +00:00
TreeHugger Robot
282a8c66c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9aa8b8906e
-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: I405927f0d2ea72cbc09861162de46b1d9fd133d0
2021-08-10 19:39:28 +00:00
Bill Yi
bb0c70c0dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8bb1d57d6
-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: I1a7b00df39eb4fcd47e0086e3237d072a06a5139
2021-08-10 19:37:53 +00:00
TreeHugger Robot
57641d0db8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-10 19:25:35 +00:00
TreeHugger Robot
764a142ea3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-10 19:25:27 +00:00
TreeHugger Robot
9aa8b8906e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-10 19:25:19 +00:00
Bill Yi
385f45f7a0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iebb44c911ceb4598c1653402af1d3b91b2b62a55
2021-08-10 15:29:49 +00:00
Bill Yi
b2ee12d3ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2af1bc241cee19780b9c3b5547fc515de9adc201
2021-08-10 15:27:25 +00:00
Bill Yi
2c121e8336
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I905ee0fb3da18a7bd2311f97da60b7735a36678a
2021-08-10 15:23:37 +00:00
Bill Yi
c8bb1d57d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5ba752738776fe16d802cb3a87cdff5da5f6481
2021-08-10 15:08:45 +00:00
Bill Yi
5cc24b1fc5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie9007a25abc0b77eae5dff3bb6c3e14bfcaa1c92
2021-08-10 14:53:51 +00:00
TreeHugger Robot
f923361f32
Merge "Use NEW_TASK|CLEAR_TOP when launching emergency app" into sc-v2-dev
2021-08-10 08:39:11 +00:00
Tom Hsu
0eb9547599
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b
am: 1d8c6a6188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710
Change-Id: I01cc1d45fb1a630345a45116078838848d254076
2021-08-10 06:26:45 +00:00
Tom Hsu
1d8c6a6188
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710
Change-Id: I1b126ab2dabd818a2675d8b2ac26f6a7949e13cf
2021-08-10 06:13:41 +00:00
Tom Hsu
939136b34b
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev
2021-08-10 06:00:44 +00:00
Tom Hsu
a17fc042dd
Selects a active sim to MobileNetworkActivity w/o subscription ID input
...
Bug:194754151
Test: Sanity test with test build. See b/194754151#21
Change-Id: Ic3449392a7f564b69c3f42cc762ec4c9ec642797
2021-08-10 04:40:52 +00:00
Curtis Belmonte
2899c874f9
Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55
am: 5968c28caf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151
Change-Id: I6e7f9d3bbcc76d243713c10b87f4817ebf2118c4
2021-08-10 00:31:51 +00:00
Curtis Belmonte
5968c28caf
Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151
Change-Id: I9299449e882dd42a6e5a56d500430e3e3f962ad6
2021-08-10 00:18:20 +00:00
Curtis Belmonte
4cb6d12b55
Merge "Make face education handle timeout result correctly" into sc-dev
2021-08-10 00:06:17 +00:00
Fan Zhang
2a3920e44d
Use NEW_TASK|CLEAR_TOP when launching emergency app
...
This flag combination will attempt to go to the existing emergency app
task stack instead of creating duplicate ones.
Fix: 193108390
Test: manual
Change-Id: Ia9c9ead4e8b1d27582cdaff3e4d42c762e80709a
2021-08-09 22:54:21 +00:00
Curtis Belmonte
ea07bb8d2f
Make face education handle timeout result correctly
...
Ensures that a result code of RESULT_TIMEOUT always causes the face
enroll education screen to finish and propagate the result.
Test: Lock and unlock screen at each stage of face enrollment
Fixes: 194857793
Change-Id: Ie4b09235f923c8a40de18878b0727f166112140f
2021-08-09 14:12:45 -07:00
TreeHugger Robot
f05653b4cb
Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f
am: b4d5a623bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615
Change-Id: I3e97e4135581767de7c83375421ed002afc4b9c0
2021-08-09 20:35:13 +00:00
TreeHugger Robot
b4d5a623bd
Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615
Change-Id: I3d67364a06f6486e8aab5c7e86100f8aaab85665
2021-08-09 20:20:18 +00:00
TreeHugger Robot
9000bdc25f
Merge "The wifi dialog text should be Google Sans Text" into sc-dev
2021-08-09 19:59:07 +00:00
TreeHugger Robot
ef72e3b1de
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours am: 876d9ec0dc
-s ours am: 88b0676d08
-s ours am: 869e01eecb
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: I8124f786900616b262ba7289c7f4524b4adcb7cb
2021-08-09 13:44:55 +00:00
TreeHugger Robot
869e01eecb
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours am: 876d9ec0dc
-s ours am: 88b0676d08
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: Ia3cf15d66f84dc53d92efab02577ec44a755416c
2021-08-09 13:25:40 +00:00
TreeHugger Robot
88b0676d08
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours am: 876d9ec0dc
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: Id2f1a85f30eb2b95459b22426dcab5abb696aed4
2021-08-09 13:06:56 +00:00
TreeHugger Robot
b948c4195e
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours am: 4a3bbeee1a
-s ours am: c06aef8e7f
-s ours am: 9246df546a
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: I4e393b085baa7b2a2d9cc3da48496a636d3584e9
2021-08-09 13:01:59 +00:00