PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,027 Commits 1 Branch 0 Tags
db534d9c4e635509fb476e893ed2227a2b6160a5
Commit Graph

74027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mill Chen
db534d9c4e Update battery saver preference key 
The updated preference key made slice auto conversion mechanism fail,
so when this slice is requested by external apps, the UI won't be shown
properly. So we need to revert the key to the original one.

Bug: 131897855
Test: manual test
1. Open Settings app -> Settings search -> search battery saver
2. Observe battery saver result item has a toggle

Change-Id: Ifb5b0a6786d60d1e67567272610cc3cb078f11a4
 2020-08-20 15:42:13 +00:00
Betty Chang
dd6f6fdb64 Merge "[Testing] Use AndroidJUnit4 instead in ApnPreferenceControllerTest" 2020-08-20 08:28:15 +00:00
changbetty
6f53c94b9a [Testing] Use AndroidJUnit4 instead in ApnPreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change the Copy Right

Bug: 165232573
Test: atest -c ApnPreferenceControllerTest
Change-Id: Iab7f648061bab9ea33f6a15231be2344be6b3499
 2020-08-20 14:13:46 +08:00
Betty Chang
0ab88f263d Merge "[Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest" 2020-08-20 04:15:36 +00:00
TreeHugger Robot
9e7961a12a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours am: c6020bf4dc -s ours am: f0e3970e0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e3393d4e3fe24165088510a05b8b233cd10bebd
 2020-08-20 00:54:48 +00:00
TreeHugger Robot
78c06fd399 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours am: 74da04187c -s ours am: c1ea758688 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91c3bd811d0bb8e623ed7fa776c54e4097da0579
 2020-08-20 00:54:18 +00:00
TreeHugger Robot
f0e3970e0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours am: c6020bf4dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d67aa96be4214c96c075781a91c7ec8beec7304
 2020-08-20 00:44:38 +00:00
TreeHugger Robot
c1ea758688 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours am: 74da04187c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a16d82c86f5f17573b88a1d92799c9c62eede0a
 2020-08-20 00:44:13 +00:00
TreeHugger Robot
c6020bf4dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id81057446689d4c1874d17f582f7738aaa62b180
 2020-08-20 00:33:05 +00:00
TreeHugger Robot
74da04187c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0536955a70b5e28da3c36b8e268bb65c746e5d1
 2020-08-20 00:33:00 +00:00
TreeHugger Robot
4b4b2b29fa Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-20 00:15:12 +00:00
Bill Yi
5f549433a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe77ec8b7ad9f52fe7b5fc7514fe7eab0bf02f6a
 2020-08-19 23:23:41 +00:00
Kevin Chyn
54a5f51dba Merge "Update settings together with frameworks/base" 2020-08-19 22:33:04 +00:00
TreeHugger Robot
dcd910ed06 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-19 16:43:17 +00:00
TreeHugger Robot
85f6aa5330 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: ed312ef4fa -s ours am: 64ceb3d8c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb5d01a49296bcc51e4440062aceb9acd7e48266
 2020-08-19 16:43:03 +00:00
TreeHugger Robot
e30b0568ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: b72f1f5475 -s ours am: 88bfc14aba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf82a407cbd8768794fc432c1963ab0298a98d9a
 2020-08-19 16:42:03 +00:00
TreeHugger Robot
64ceb3d8c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: ed312ef4fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife48c37c57f413abf5c5a9f2bed0f9359174be7f
 2020-08-19 16:34:40 +00:00
TreeHugger Robot
88bfc14aba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: b72f1f5475 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07d7f394e089e62f3b78c263a8b5b488d0985c61
 2020-08-19 16:28:55 +00:00
TreeHugger Robot
e0d9bcd358 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 90509b64fe -s ours am: d9bf35b984 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a068f50e0a4365616162989484f0566a4698ca3
 2020-08-19 16:25:20 +00:00
TreeHugger Robot
7784b6bce2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 670032d648 -s ours am: cb977356ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6003ca52586d5771761d1e24c32af55ce34d63b
 2020-08-19 16:25:10 +00:00
Beth Thibodeau
043ec22d6e Increase char limit am: 11f8554405 am: 8baf14632c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407749

Change-Id: Idd7563cc6b755fbcfaaf91d3cbebbd9552a021ef
 2020-08-19 16:24:55 +00:00
TreeHugger Robot
ed312ef4fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89eb71a124a82e9b64173ff1c37d92d085b5902d
 2020-08-19 16:19:57 +00:00
TreeHugger Robot
b72f1f5475 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie03b90f093eaedc84b8845b4cae9b08ea337eeeb
 2020-08-19 16:19:22 +00:00
TreeHugger Robot
d9bf35b984 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 90509b64fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65fd37462834c50a53f54e556fdc1649d47d5bb2
 2020-08-19 16:12:37 +00:00
TreeHugger Robot
cb977356ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 670032d648 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56a3ebde83f44e6adcd089d6470d2c1af45466fc
 2020-08-19 16:12:26 +00:00
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
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