Beth Thibodeau
8baf14632c
Increase char limit am: 11f8554405
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407749
Change-Id: I58ab443af092a3c96eaeb9ff0d30f6bd1b0fce29
2020-08-19 16:11:30 +00:00
TreeHugger Robot
1c9f9d50cf
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-19 16:09:20 +00:00
TreeHugger Robot
90509b64fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-08-19 16:03:05 +00:00
TreeHugger Robot
670032d648
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-08-19 16:00:55 +00:00
Treehugger Robot
aa6fd24c45
Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
am: e40251b9f5
am: af6dfc4b8c
am: ece108cc9a
am: f00eba5b87
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083
Change-Id: I151077343415ebc89c7b2dd084586e038d0ebaf1
2020-08-19 15:41:28 +00:00
Treehugger Robot
f00eba5b87
Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
am: e40251b9f5
am: af6dfc4b8c
am: ece108cc9a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083
Change-Id: If651cf8cbf4649931d7dd1daf5fb86c466f3d449
2020-08-19 15:30:09 +00:00
Treehugger Robot
ece108cc9a
Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
am: e40251b9f5
am: af6dfc4b8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083
Change-Id: I7912e42f3ddc32e6470790b97c983b561906ffaf
2020-08-19 15:18:31 +00:00
Treehugger Robot
af6dfc4b8c
Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
am: e40251b9f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083
Change-Id: I32affa3deffca49e15bdeb9792bb995c00cb58f6
2020-08-19 15:08:01 +00:00
Treehugger Robot
e40251b9f5
Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083
Change-Id: Iad9e0eb16478e12ff2e5340c34bb8cc4ba5ece3e
2020-08-19 14:56:13 +00:00
Beth Thibodeau
11f8554405
Increase char limit
...
More chars needed for translation, and the settings screen that this is
displayed on can already scroll to accomodate extra text.
Fixes: 165029743
Test: manual
Change-Id: Ia7be446901ee6ede7d0ea3b71a4488485de79caf
2020-08-19 14:48:42 +00:00
Treehugger Robot
16503cf517
Merge "Settings: Fix exception in about phone during SIM swap"
2020-08-19 14:47:21 +00:00
Julia Reynolds
f253250883
Add null check
...
Test: manual
Fixes: 161386023
Change-Id: Id4b3de8fd87f6c809dfcc18630af21fe0609c3e0
2020-08-19 09:45:00 -04:00
Bill Yi
fdb7673295
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I56762eb50f2043b18c864f4436bbe7baae8bfc69
2020-08-19 04:32:06 -07:00
Bill Yi
ce56500655
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1ad07265a1ca636a35b8ab530b1a59a6c71d2b76
2020-08-19 03:03:00 -07:00
Bill Yi
db1ae6ce87
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I20ba771cd7f5a0bfc3ca1b9542f83fc80cb31edb
2020-08-19 01:35:18 -07:00
Automerger Merge Worker
a558cf0945
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: 69605d12d0
-s ours am: 6d103087f5
-s ours" into rvc-qpr-dev-plus-aosp am: 4996bc3703
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I301f774389578a1278a62fc957a1cee23bae68d0
2020-08-19 07:59:46 +00:00
Automerger Merge Worker
2bf166b19e
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours am: 378313593e
-s ours" into rvc-qpr-dev-plus-aosp am: db52445503
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: Idff514e0ed505ad3428ea9bc5c010eeb4a416cc4
2020-08-19 07:59:39 +00:00
Bill Yi
32255ce964
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours am: 921836ad03
-s ours am: f5d33b43f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: Ib07433a871f1bcdb9d40010ec694b6e76e54ec67
2020-08-19 07:59:23 +00:00
PETER LIANG
f92160da4a
Merge changes from topic "color_correction_b_148785841"
...
* changes:
Fix the screen will move by itself when enabled Color correction.
Refine and migrate the functions that related to update preference into the specific lifecycle.
2020-08-19 07:51:41 +00:00
Bill Yi
9d00912dc0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3362a8464a53c7b75b3e73989951668ddbcd18c1
2020-08-19 00:50:39 -07:00
Automerger Merge Worker
4996bc3703
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: 69605d12d0
-s ours am: 6d103087f5
-s ours" into rvc-qpr-dev-plus-aosp
2020-08-19 07:46:38 +00:00
Automerger Merge Worker
db52445503
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours am: 378313593e
-s ours" into rvc-qpr-dev-plus-aosp
2020-08-19 07:46:36 +00:00
Bill Yi
432082489f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: 69605d12d0
-s ours am: 6d103087f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I53321eb8e940a22b141e8cfb50d7a893ac34a69a
2020-08-19 07:46:35 +00:00
Bill Yi
39f19a3075
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours am: 378313593e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I6b9cf5f2a76337db868357a83941dc6ed21d8122
2020-08-19 07:46:32 +00:00
Bill Yi
f5d33b43f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours am: 921836ad03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I87277b6d1daf03f3d6d75bcc741f6831a9e93fd3
2020-08-19 07:46:23 +00:00
Bill Yi
6d103087f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: 69605d12d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I3e07df5a184a12aa61997fb9db07fa7f80b71f88
2020-08-19 07:35:33 +00:00
Bill Yi
378313593e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: Ieacb714ceb7fe2a150963db31fb8bc818132a7ef
2020-08-19 07:35:33 +00:00
Bill Yi
921836ad03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: Iae39fc4a676ce4e8c4567dcc3649f8a167711078
2020-08-19 07:35:25 +00:00
Bill Yi
69605d12d0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I87be371a25573e769edbb80ed0817e02efb69cd5
2020-08-19 07:19:41 +00:00
Bill Yi
dc84153e81
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I46ef5ca050eb20176ce6783f3d4479b98823067b
2020-08-19 07:19:33 +00:00
Jason Hsu
f164cf8539
Merge "Fix checkbox in magnification mode dialog does not have ripple effect"
2020-08-19 04:57:20 +00:00
Bill Yi
7f9d903a21
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e397185b6e1a9d39e8af8d83c9f0c766ff09349
2020-08-18 21:53:23 -07:00
Peter_Liang
896e18012d
Fix the screen will move by itself when enabled Color correction.
...
Root Cause:
Using the listener to update the UI dynamically might have some time delay.
Solution:
Refactor to another implementation and avoid using the listener to update it.
Additional condition:
Add height restriction in preference to avoid the palette view to cover whole screen.
Bug: 148785841
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PaletteListPreferenceTest
Change-Id: I6a854e16321b3426e2f8ff65c6404036d55caed4
2020-08-19 11:59:59 +08:00
TreeHugger Robot
e9c717b6c6
Merge "Add Panic button sound preference to panic gesture settings page."
2020-08-19 02:01:06 +00:00
Automerger Merge Worker
6d9bafb14f
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 5b84d06935
-s ours" into rvc-qpr-dev-plus-aosp am: dba49a339c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: I82c02e437baceaab084d5b13ac97849d7d5e8a7e
2020-08-19 00:14:37 +00:00
Bill Yi
8bfcb46566
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 71f92d16f6
-s ours am: 9f83e2311d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: I1d328e23336137f4c6bf55fd18fd1103da690f9f
2020-08-19 00:14:24 +00:00
Automerger Merge Worker
dba49a339c
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 5b84d06935
-s ours" into rvc-qpr-dev-plus-aosp
2020-08-19 00:06:46 +00:00
Bill Yi
ee0336cfdd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 5b84d06935
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: Ic4f58799fb98474e3a821a2ad1738dc23a030d97
2020-08-19 00:06:42 +00:00
Bill Yi
9f83e2311d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 71f92d16f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: I4e0bb025276fb7c296befad128ec4b7855300892
2020-08-19 00:06:38 +00:00
Bill Yi
71f92d16f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: I7a85b209939df65602839039ba06c04ca20f3071
2020-08-18 23:55:57 +00:00
Bill Yi
5b84d06935
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: I0de30d4aafd65ab184661b0b58979cedc5367f4a
2020-08-18 23:55:49 +00:00
Bill Yi
dba8d2eeb4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iad6c46f99fb4b3c48b6580c03a6e482655714213
2020-08-18 15:50:45 -07:00
Julia Reynolds
a09121353d
Merge "Don't put a null in a spannablestringbuilder"
2020-08-18 18:48:28 +00:00
Fan Zhang
67d3454265
Add Panic button sound preference to panic gesture settings page.
...
Also renamed emergency_sos_* to panic_*. "emergency sos" is used by
other OEMs.
https://screenshot.googleplex.com/66097f3e-6aa0-4e2f-afb8-22f278bb0ed7.png
Bug: 161394591
Test: robotests
Change-Id: I14a59399fe7192d305d89a86dc93380c1e4c8a1c
2020-08-18 09:19:33 -07:00
Beth Thibodeau
860397d815
[automerger skipped] Allow user to block individual apps from resuming. am: 48ce5892e8
am: ee7da79fbf
-s ours
...
am skip reason: Change-Id Id3de52419ffba233469396dd47439428201e5e00 with SHA-1 f01cce88fc
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392268
Change-Id: Icae457d3477181f13c751e5d904bb9b05c7638c5
2020-08-18 14:49:37 +00:00
Beth Thibodeau
ee7da79fbf
Allow user to block individual apps from resuming. am: 48ce5892e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392268
Change-Id: I131ff7c33871d858a63824fc17ba168ba590f6e2
2020-08-18 14:39:26 +00:00
Betty Chang
19a7ddd02b
Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest"
2020-08-18 10:27:32 +00:00
changbetty
fc29bdedc7
[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change the Copy Right
4. Create the real object for PhoneAccountHandle and ComponentName
Bug: 164989754
Test: atest -c MobileNetworkUtilsTest
Change-Id: I1778832b0602062adb24928343c0c1d0e525942d
2020-08-18 16:18:56 +08:00
hoffc
291fd9b816
Settings: Fix exception in about phone during SIM swap
...
In about phone SIM status dialog fragment does not correctly remove the subscription change listener and broadcast receiver during SIM swap, which results in IllegalStateException force close and memroy leak.
Make sure to remove sub change listener and un-register broadcast receiver in SIM swap case.
Bug: 159410236
Change-Id: I7867852c58b2b38e0afc73422b7d616aa305199c
2020-08-18 13:57:55 +08:00
TreeHugger Robot
d453134ac1
Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2
am: e87f0d9fa2
am: ef7b3433a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931
Change-Id: I1ae5cd31a99659d6240c756cc88601185c40b25b
2020-08-17 20:40:17 +00:00