PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,947 Commits 1 Branch 0 Tags
35e7a17b9f034a2ef76d6db002b6fe8e710c654f
Commit Graph

76947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
a5ee544e7c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2020-08-19 08:51:07 +00: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
abb6377cd5 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: a558cf0945 -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: Ia1f4f5e04be09d49bafb43862b63cbe86026e72e
 2020-08-19 08:04:06 +00:00
Automerger Merge Worker
88ceecfbfb 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: 2bf166b19e -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: I480f0170672c7702f08b4bfb29ee36b33c5bca9b
 2020-08-19 08:04:01 +00:00
Bill Yi
8600c33b9f [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: 32255ce964 -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: Idcfec7f899193406328566ef15f2ebee816adbd7
 2020-08-19 08:03:53 +00:00
PETER LIANG
777eb1e2a7 Merge changes from topic "color_correction_b_148785841" am: f92160da4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369335

Change-Id: I237be7ea5c54a7ced8200cd53f6215dd68c330dd
 2020-08-19 08:03:44 +00: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
2b451871f5 [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: I106d36bab1e76823ef48acd36f726646003cedd8
 2020-08-19 07:19:47 +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
cf21abf418 Merge "Fix checkbox in magnification mode dialog does not have ripple effect" am: f164cf8539 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369338

Change-Id: Icc0a14fe60c49fe621d0e48f61878ad7a5c87b2e
 2020-08-19 05:15:44 +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
24f36e71f6 Merge "Add Panic button sound preference to panic gesture settings page." am: e9c717b6c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12390081

Change-Id: Ic8d86cc46378209d2af49a2ec00d8f114efe1123
 2020-08-19 02:50:34 +00:00
Bill Yi
45db58889e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia93aec9ac2caa0876e02e34cc64cb13c00d7aaef
 2020-08-18 19:40:21 -07: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
f7c1c40604 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: 6d9bafb14f -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: I709e4bcf533ebf3402e7610184fb14b9afbba10c
 2020-08-19 00:24:06 +00:00
Bill Yi
700bd87961 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours am: 71f92d16f6 -s ours am: 9f83e2311d -s ours am: 8bfcb46566 -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: If0659a311bc07ef30b8cf9cea6b8f46290032231
 2020-08-19 00:24:00 +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
33a6256e9a Merge "Don't put a null in a spannablestringbuilder" am: a09121353d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392874

Change-Id: I454df94af9e821de01815b408b4417c0d5e7e57f
 2020-08-18 19:02:17 +00: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
eaa7e92f06 [automerger skipped] Allow user to block individual apps from resuming. am: 48ce5892e8 am: ee7da79fbf -s ours am: 860397d815 -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: Iadf7926de6d55089a5128a67e0f091f7be7cb9aa
 2020-08-18 15:08:05 +00: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