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

19642 Commits

Author SHA1 Message Date
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
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
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
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
f6f0c966a9 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 565f4b5730 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I045be75427f44db3ca778391bb64cbfe81822c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 23:10:47 +00:00
TreeHugger Robot
e22ced8920 Merge "Fix AccessibilityButtonFragmentTest" 2023-06-02 23:07:47 +00:00
Chun-Ku Lin
c7cd3783ba Fix ToggleFeaturePreferenceFragmentTest#setupFragment_getExpectedPreferenceScreenResId 
**Root cause**
Robolectric doesn't like to launch a spy'ed fragment. You will get an
error like java.lang.IllegalStateException: Can't access ViewModels from detached fragment

Since the test itself doesn't require launch a fragment, I removed the
setup part and renamed the test.

Bug: 279082331
Test: atest ToggleFeaturePreferenceFragmentTest
Change-Id: Iafc431fd8c9cf7812ea99164e5e85683f3e0c121
 2023-06-02 22:52:13 +00:00
TreeHugger Robot
4834abe241 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:23:17 +00:00
TreeHugger Robot
701610cd39 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: ac91d63f00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

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

Change-Id: I2bc382165446ca91d4662b151174463781ae5c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:21:34 +00:00
Chun-Ku Lin
e63659e6db Fix AccessibilityButtonFragmentTest 
**Root cause**
We expected the spy resources will be used when calling
context.getResources(). However, we didn't set up the connection. Hence
the test failed due to trying to use the original resources.

Bug: 279082331
Test: atest AccessibilityButtonFragmentTest
Change-Id: Ib6e51b2b2607bec7980b9288a0a8076e4a036863
 2023-06-02 22:15:15 +00:00
TreeHugger Robot
f0503e2a51 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 21:36:40 +00:00
TreeHugger Robot
25d24e0cf0 Merge "Restrict SimDialogActivity" into udc-dev 2023-06-02 20:41:47 +00:00
TreeHugger Robot
cddd329f80 Merge "Fix ToggleScreenMagnificationPreferenceFragmentTest" 2023-06-02 19:39:07 +00:00
Treehugger Robot
249107bc45 Merge "Fix AccessibilityHearingAidPreferenceControllerTest" 2023-06-02 17:48:23 +00:00
Treehugger Robot
5a718028b0 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: d19f4f85fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I748f8989347cc703c941e6bb41008f22e70d7627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 16:25:02 +00:00
YK Hung
748a9d228f Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d am: 6f892d206b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I836fd07341a8817fd2d267f4aed049b345e2469e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 16:19:49 +00:00
Treehugger Robot
d19f4f85fd Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I9277de61513b892dee6517e2a6a393f77451e9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 15:56:40 +00:00
YK Hung
6f892d206b Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I924fe9631af514f947d278f32e808938a9c4c72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 15:50:24 +00:00
Treehugger Robot
3ac151950a Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 88a51ef8be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: Id13a9a99f652848a60d38813e5802b9d34b1bcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 15:37:32 +00:00
YK Hung
a23fdeef7a Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 466e7c56b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I10082d3d520ae0438f493dd6b4af6055eb4d2a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 15:29:09 +00:00
Chun-Ku Lin
0aea3ddb33 Fix AccessibilityHearingAidPreferenceControllerTest 
**Root cause**
When adding a feature flag on showing different hearing aid page on
 click, the tests were not executed because they were marked as @Ignore.

In order to execute the test, we need to turn the feature flag off, so that the test run in the same scenario where the feature flag was not introduced.

Bug: 279082331
Test: atest AccessibilityHearingAidPreferenceControllerTest
Change-Id: If11ac40a7ea3926578992f7c0577e7cbb1bb3273
 2023-06-02 06:47:38 +00:00
Treehugger Robot
da647c56cf Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: Ie80f779283a48571a5169b7c408bc5a300640866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 05:07:08 +00:00
Treehugger Robot
91737c0b3b Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I272844e63ff78dc9ef730c04b768ee2dc1634e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 04:24:57 +00:00
Treehugger Robot
47d3cfe635 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev 2023-06-02 04:19:22 +00:00
Chun-Ku Lin
c8c67d731f Fix ToggleScreenMagnificationPreferenceFragmentTest 
- Prevent mocking ToggleScreenMagnificationPreferenceFragment for test
- Use Robolectric's way to launch the fragment so that the fragment
  contains necessary setup

**Root cause**
- We called onCreateView directly in the test without the necessary setup
  in onCreate, which causes the FooterPreferenceController not being
  initialized.
- We created a spyContext that returns a mock PackageManager, however,
  in the test execution, we didn't mock the context used by the fragment
  under test. Hence, the fragment didn't use the mock PackageManager in
  test.

Bug: 284209879
Test: atest ToggleScreenMagnificationPreferenceFragmentTest --iterations
5

Change-Id: I7e71a03177526f5bb0c20a58855a7dfdffc2a22f
 2023-06-02 03:04:37 +00:00
YK Hung
9ec0a502ac Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: Ia022e43707b71187ac98c2a9aea6d6f772cab162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 01:43:57 +00:00
YK Hung
4eabcdea6d Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I7a3133f83570a82bb5e87dd1096d5d47f85f3390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 01:22:21 +00:00
YK Hung
bfc4637d09 Merge "Update incompatible charger checking rule" into udc-dev 2023-06-02 00:50:17 +00:00
Weng Su
ef81179538 Skip Wi-Fi hotspot in Settings Widgets 
- Do not show Wi-Fi hotspots in Settings Widgets if the config is not set to show

Bug: 275268676
Test: Manual test
atest -c CreateShortcutPreferenceControllerTest

Change-Id: I5d86a78c9d48c9b63faff50d46f1254dbefd94cf
 2023-06-02 04:54:59 +08:00
Treehugger Robot
0a9fe7a3ab Merge "Adding ShadowBluetoothAdapter for the test" 2023-06-01 18:52:02 +00:00
Prabir Pradhan
edbc95e817 Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72dc am: 753647d584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23356796

Change-Id: I9c43018307252742022d19443c3423fa4ee05550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 18:24:09 +00:00
Prabir Pradhan
753647d584 Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23356796

Change-Id: Icc77794741fcbeb32726dddc972d75819b77428a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 18:18:33 +00:00
Chun-Ku Lin
b34dcecc58 Adding ShadowBluetoothAdapter for the test 
Many robotests that touches BluetoothAdapter might need to use our own
ShadowBluetoothAdapter which implements a "fake" getSupportedProfiles
call, so that the test won't trying to execute the android framework's getSupportedProfiles method.

Bug: 285235777
Test: atest AccessibilitySettingsTest

Change-Id: I5b3b2f4528a2b32aff22928653c57576981c0ff9
 2023-06-01 17:50:10 +00:00
Prabir Pradhan
8fca8a72dc Merge "Add "Show key presses" to input developer options" into udc-qpr-dev 2023-06-01 17:37:44 +00:00
Pavel Grafov
81e7bac047 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I8ce1a31df186ab0a396c8b0858286fd1cc53f740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 17:35:41 +00:00
Pavel Grafov
fe800cc8a1 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa am: fa0a6b46dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ice3fb038905d559362ebcbcf66bdb9a047e93e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 17:26:37 +00:00
Pavel Grafov
fa0a6b46dc Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ibec147373fadf2c5a8a7550b541b75961fb41a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 16:46:35 +00:00
Pavel Grafov
40897d4bec Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: fb15f59582 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I3411ef7f49b9327690c07e5413ba3dbaf95064a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 16:41:23 +00:00
Pavel Grafov
4c5394afb3 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I6a82013b578378facf575a6daa9070ff337d0fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 16:38:28 +00:00
Pavel Grafov
4aef4043aa Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I9eaafcb4e1ce813e8775cbce0c6eda5137e922fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 15:57:28 +00:00
Pavel Grafov
8e13abebc0 Merge "Avoid double quiet mode requests" into udc-dev 2023-06-01 15:31:13 +00:00
Angela Wang
6451a35d3e Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev am: d91da4f4ca am: 4560d2f83b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23412076

Change-Id: I782742799c995339e9f00ba2265acd84fb2ee3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 12:24:00 +00:00
Angela Wang
4560d2f83b Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev am: d91da4f4ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23412076

Change-Id: I3e99952c7148cffd16d87487733fcc12731a3211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 11:41:38 +00:00