PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,260 Commits 1 Branch 0 Tags
aadecbaf34e88405848cab093fdadf018b246f5d
Commit Graph

19665 Commits

Author SHA1 Message Date
Milton Wu
aadecbaf34 [BiometricsV2] Refactor model code to kotlin 
Bug: 286196884
Test: atest FingerprintEnrollmentActivityTest CredentialModelTest
      EnrollmentRequestTest FingerprintEnrollIntroViewModelTest
      FingerprintEnrollmentViewModelTest
Test: atest biometrics-enrollment-test
Change-Id: I2bdae4d2dd052d3664a790cd982edf51fcebec09
 2023-06-13 10:29:16 +00:00
Han Xu
1a9a892ff3 Add manufactured year into hardware info page am: b452bc9f9d am: eefb4e777d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Id5c47cbcbefad23dc81eb4e597aed8a21a36affc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:06:10 +00:00
Treehugger Robot
f572bed648 Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1 am: 6fb7cb85fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999

Change-Id: I31ff110702752ffcd819e94106a1434963ef6e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 10:37:10 +00:00
Treehugger Robot
6fb7cb85fd Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999

Change-Id: I33ea753d6fcf8ced79a315652134513b40b0cfb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 09:55:15 +00:00
Han Xu
b452bc9f9d Add manufactured year into hardware info page 
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
 2023-06-12 17:43:55 +08:00
Treehugger Robot
55774422b1 Merge "Remove redundant methods and refactor" into udc-qpr-dev 2023-06-12 09:05:05 +00:00
Yi-Ling Chuang
f148baa372 Remove redundant methods and refactor 
Remove the summary method and write the code in AOSP directly instead to
force string consistency. Also refactor a bit after the modification.

Fixes: 276399056
Test: robotests
Change-Id: I76ad740b694363a3cdfb3748e41c840fb678b93d
 2023-06-12 16:11:49 +08:00
Treehugger Robot
bae3bf9b63 Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160 am: 34a254fc0c am: cc4410e536 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566

Change-Id: Idfc98b457000a4968a47651b35f271e3bc20c3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:33:29 +00:00
Treehugger Robot
cc4410e536 Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160 am: 34a254fc0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566

Change-Id: I1f9fa9e219f1192945824aa4b07c9149e8a2876f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 05:42:42 +00:00
Treehugger Robot
4b44c6632e Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566

Change-Id: I5b91a44f9c947d6686a28cb2acb2c41f58e8fe01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 05:02:25 +00:00
Treehugger Robot
34a254fc0c Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566

Change-Id: Iea9c52ce4cfb37e4dc3df58a8117adb6b85e6c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 04:58:22 +00:00
Treehugger Robot
a99c52e160 Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev 2023-06-09 04:29:16 +00:00
Weng Su
7171e0a29b Show "Not available" summary when hotspot speed is unavailable 
- Show "Not available" summary when hotspot bands (5 GHz and 6 GHz) are unavailable

- Update debug logs to track down issues

Bug: 285769583
Test: manual test
atest -c WifiHotspotSpeedSettingsTest
atest -c WifiHotspotSpeedViewModelTest

Change-Id: If1050c120b4b612d3a9adbe886c2f12db82b793e
 2023-06-08 21:38:01 +08:00
Hao Dong
3d81e3893e Clean up multi window toast on FingerprintEnrollEnrolling. 
ag/22361082 and ag/22460413 have added a dialog preventing entering
FingerprintEnrollEnrolling. So showing toast and early return in
onCreate() will never be reached. This CL cleans up this obsolete code
block.

Bug: 283244022
Test: N/A

Change-Id: Ifc5f3d909a275c735035146e44f70d2b5d5b51e3
 2023-06-07 18:19:13 +00:00
Treehugger Robot
24e5321dfb Merge "Move DisplayDataSizeTest to AndroidJunitTest" 2023-06-07 01:25:28 +00:00
Chun-Ku Lin
24b045c987 Move DisplayDataSizeTest to AndroidJunitTest 
**Root cause**
- When DisplayDataSizeTest was created, it was ignored already due to
b/214161063. That means the test never passed in the beginning.

- The default display's type in Robolectric is TYPE_UNKNOWN. However, in
the constructor of DisplayDensityUtils, we check all the display that is
not TYPE_INTERNAL can't be a default display. Hence the test failed.

- Even if we shadow the DisplayInfo to have TYPE_INTERNAL for default
  display, the test still failed, because whenever we tried to get the
  default display density we always get 0, and doens't have other diplay
  density values. Hence we can't test increasing the display size in
  Robolectric Test.

Note: the solution here is a workaround for waiting AsyncTask to finish.
If we ever change the implementation in DisplayDensityUtils to not use
AsyncTask, we'll need to update the test.

Bug: 279082331
Test: atest DisplaySizeDataTest --iterations 20

Change-Id: I3ccee5e7ba4d9399a8b715d84a9d53e106f88762
 2023-06-07 00:06:48 +00:00
Ale Nijamkin
fd48767844 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: dc6449157b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Ifad706722aa509bcad777a6af0fd4749629eb5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:10:27 +00:00
Ale Nijamkin
163c01ab4c Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Ie370f2e7fe8e473d46fec5a88ee831042d47903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:27:23 +00:00
Ale Nijamkin
dc6449157b Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Iac1b92075d8113012e69bdc82462921191690ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:26:05 +00:00
Ale Nijamkin
d31487b529 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 306421f87f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I6ca144e73e9d3e4465dcfd0325b57add2f61f426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:23:19 +00:00
Ale Nijamkin
1e3ecf6352 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:44:29 +00:00
Ale Nijamkin
b5dda005fd Merge "Fixes nav stack issue." into udc-dev 2023-06-06 18:48:59 +00:00
Alejandro Nijamkin
6f9f3a4594 Fixes nav stack issue. 
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.

Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.

Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
 2023-06-05 16:02:17 -07: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
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