PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,441 Commits 1 Branch 0 Tags
273e3ee549e84d1f8586a3f7e4b9e7375ec684ad
Commit Graph

129441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
273e3ee549 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: 0813a0de64 -s ours am: 84b1429d7c -s ours am: b3db689a07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib78e1c66ebd6b3411b9b8be17dbc11b9aeed4c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:14:40 +00:00
Bill Yi
4c362b04a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: f108c63394 -s ours am: 9ef2618eca -s ours am: 669b36847a -s ours am: ad2955260e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6e2b2d228eeeac082e2cb5b5064a1e8828f78b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:09:45 +00:00
Bill Yi
e19638f589 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: a9bc102471 -s ours am: 8676a3d6b2 -s ours am: 5e5e76f00d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic23ed92edcf7ceb7f3ba211a95f29fa1f3f40d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:58:29 +00:00
Bill Yi
b3db689a07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: 0813a0de64 -s ours am: 84b1429d7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbc10b130fdec49626dfbc611f794afa3790f110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:49:58 +00:00
Bill Yi
ad2955260e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: f108c63394 -s ours am: 9ef2618eca -s ours am: 669b36847a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I346977eb3a800d84a19ff58c0390eb9b7e690e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:47:04 +00:00
Bill Yi
5e5e76f00d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: a9bc102471 -s ours am: 8676a3d6b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d4ef72585bc6669927cefae293cc3f91ac2172d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:46:21 +00:00
Bill Yi
669b36847a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: f108c63394 -s ours am: 9ef2618eca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ae5f9990d6a083bd0106f8bb489d65c220ea6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:16:39 +00:00
Bill Yi
8676a3d6b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: a9bc102471 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82bbc514e284bca4fe52a6fa7f921df6177f0cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:16:23 +00:00
Justin Gross
b8e639fbea Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: e8e2f86c4c am: a255995531 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I06707bea9dd4c1985cae82a34da8379b7a214c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:04:37 +00:00
Justin Gross
b71468ecde Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 5e2768327a am: 9a2fdfef3a am: c1bd5b34c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I89bd94d7aea480acaaf0d236169e2304f3d6317a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:02:17 +00:00
Justin Gross
cad977a0bd Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: b9d09dddda am: 73dcd293c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: Ia4e5e674a098e444230f327b8fcbe45284b9a0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:01:45 +00:00
Bill Yi
84b1429d7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: 0813a0de64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbbca673f028d22f7453a287ea54e99d1ed96834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:59:20 +00:00
Bill Yi
9ef2618eca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: f108c63394 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I653c865636253df6b60d89b18965dbd4ac54fc52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:58:53 +00:00
Bill Yi
a9bc102471 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a0d68e98124579ee8f4ae7fea209960abc73282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:58:43 +00:00
Bill Yi
0813a0de64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4792833097104a72e31f67733d77948812fcb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:37:01 +00:00
Bill Yi
f108c63394 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e93a216a570bf7cd685e691e593ba8163089f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:13:06 +00:00
Bill Yi
0a31322199 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf4243052f0b3cf46d02ca11aa64f9e48e8c9a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:11:33 +00:00
Treehugger Robot
332359fa4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 276d663000 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80b8fdfe4fa5a77eb129ea5547f6e4ba2cdb58dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:09:28 +00:00
Bill Yi
e0e20d3078 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d58a22db6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I517039779b2c4d9153659ed986097bcd6db22c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:09:15 +00:00
Justin Gross
a255995531 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: e8e2f86c4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I48070acd1f0395f42f4f796302cdb72364a63e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:53:25 +00:00
Justin Gross
c1bd5b34c2 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 5e2768327a am: 9a2fdfef3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: Idc094ece1794590de17a59b8b7bc24ac68aae41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:51:39 +00:00
Justin Gross
73dcd293c3 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: b9d09dddda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I2753b78613de8d49c3dad49b4b5cd5ce058d0e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:49:39 +00:00
Treehugger Robot
276d663000 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-05 19:34:58 +00:00
Justin Gross
e8e2f86c4c Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I3463151328ed5ed16afb20616dd4f6e9653ac143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:27:32 +00:00
Justin Gross
9a2fdfef3a Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 5e2768327a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I0188769c0ee14b22c008a99f96c2a4b438aa56d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:27:20 +00:00
Justin Gross
b9d09dddda Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I4bed3fa8bf3800894c159b2e6c11361ee1cf0cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:25:12 +00:00
Justin Gross
b70ec810f7 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 7dd84f9399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I3e385188a3698b07bf9ff603e63389cafb28f2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:24:55 +00:00
Justin Gross
5e2768327a Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I17069f20447108b5346fc7246288e8ba93b35f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:37:33 +00:00
Justin Gross
0e3ea95a58 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: Id08742370d36beeacedcad6538c8482c465b0324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:36:49 +00:00
Justin Gross
7dd84f9399 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: If1323ef60c7743c767b06d4d88cde121d0e9ca0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:36:45 +00:00
Treehugger Robot
13c488fc3c Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb am: 065885622b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343

Change-Id: I938c2414fec70253fa4c38f8e5959d04e121e2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:36:44 +00:00
Treehugger Robot
065885622b Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343

Change-Id: Iee500ce4346a8554a37a4ff98ae5f3775b3ad411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:03:19 +00:00
Justin Gross
89e829e3dc Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev 2023-06-05 18:00:15 +00:00
Treehugger Robot
7dd9e05701 Merge "Use spy to inject the return value of a boolean resource" 2023-06-05 17:29:36 +00:00
Treehugger Robot
dbec7ba7fb Merge "Use custom action key icon" into udc-qpr-dev 2023-06-05 16:56:35 +00:00
ykhung
ab5e21ec07 Make the estimator cache logic is the same as SysUI flow am: 53f48c4a97 am: 7dec603727 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557957

Change-Id: Ida834748587c6ad730a72dc510e9b21720ee9152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 07:45:38 +00:00
ykhung
7dec603727 Make the estimator cache logic is the same as SysUI flow am: 53f48c4a97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557957

Change-Id: I42405b0eef20370cc6a838d1040149f9a635d391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 07:02:11 +00:00
Bill Yi
1b5824f6c9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia19dd8b4893160c436ed2a4b548b1c0a18ac5642
 2023-06-04 18:44:23 -07:00
ykhung
53f48c4a97 Make the estimator cache logic is the same as SysUI flow 
Ensure the remaining time estimator cache logic is the same as SysUI
https://source.corp.google.com/android/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java;l=375-386

Test: presubmit
Fix: 285747156
Change-Id: If7218dc70792aafaec45c71018897bed80df7f3d
 2023-06-05 01:39:41 +00:00
Bill Yi
2d58a22db6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I75a0bb2c27d7210e330c99ad2469f4d3b99bb32f
 2023-06-04 11:18:03 -07:00
Chun-Ku Lin
7e868fa690 Use spy to inject the return value of a boolean resource 
**Root cause**
The test was failing because it was not grabbing the boolean resource
from the values-mc999 folder. I'm not sure what changed in Robolectric
that causes it not able to find the resources based on the
qualifiers.

Bug: 279082331
Test: atest TopLevelAccessibilityPreferenceControllerTest
Change-Id: Ie738d1ada1a87b48f34efb7e0477c691c4d44d1e
 2023-06-03 06:29:43 +00:00
TreeHugger Robot
2247bb0a0e Merge "Update the FlashNotificationsPreferenceFragmentTest to return correct metric category" 2023-06-03 05:52:27 +00:00
Chun-Ku Lin
0f0461518e Update the FlashNotificationsPreferenceFragmentTest to return correct 
metric category

**Root Cause**
The test was written when the metric category is set to 0. After we
update the metric category to FLASH_NOTIFICATION_SETTINGS in the
FlashNotificationsPrefereenceFragment, we forgot to update the test.

Bug: 279082331
Test: atest FlashNotificationsPreferenceFragmentTest
Change-Id: Icd709bd9e571ca264226d0ca860e5c482eae3927
 2023-06-03 04:56:22 +00:00
TreeHugger Robot
5ba5a9e86f Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 4834abe241 am: 3362e7999e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I73e7ff5a6a27965f990945880862c1a08786bbad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-03 00:25:59 +00:00
TreeHugger Robot
f5af589694 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: a7b0933819 am: f716dc591a am: 965278dc4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: If50cc9b5502cbc34bc8da84ee4d382772949a4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-03 00:24:49 +00:00
TreeHugger Robot
934de128c0 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 565f4b5730 am: f6f0c966a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I63987c2d977dc60065c6128d66cd3f5b725dbe99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-03 00:23:24 +00:00
TreeHugger Robot
463fce7dae Merge "Pass the constant actionId directly when calling performAccessibilityAction" 2023-06-03 00:11:07 +00:00
TreeHugger Robot
e6b3ba84ca Merge "Fix ToggleFeaturePreferenceFragmentTest#setupFragment_getExpectedPreferenceScreenResId" 2023-06-02 23:47:08 +00:00
Chun-Ku Lin
de5809a4f6 Pass the constant actionId directly when calling 
performAccessibilityAction

**Root cause**
When constructing an AccessibilityAction, robolectric's
ShadowAccessibilityAction uses reflection to get the private static
final variable `ACTION_TYPE_MASK` to check if the passed action is a
valid action.

However, since ag/I744b3a94fe3c3cc3b559758a95ab0b5b181155bb we renamed
the internal variable, hence robolectric is not able to find the
ACTION_TYPE_MASK variable when using reflection.

By passing the action id directly when calling
performAccessibilityAction, we don't need to use
ShadowAccessibilityAction anymore.

Bug: 279082331
Test: atest AccessibilityQuickSettingsTooltipWindowTest

Change-Id: Ie956de44c9b19a2d19470ad670866d77ca272b3b
 2023-06-02 23:23:22 +00:00
TreeHugger Robot
3362e7999e Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 4834abe241 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I77fd8d9224b1d9428aea7b14ba8924fd8cedead5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 23:12:36 +00:00