Commit Graph

354 Commits

Author SHA1 Message Date
Edgar Wang
fb30cb68cf Fix homepage icon didn't hide in portriat mode
- also fix don't tint homepage icons when homepage_revamp enabled

Bug: 343162224
Test: manual
Change-Id: I85b65239cb852cd914a5fd889ec366bf336fd446
2024-05-29 08:54:12 +00:00
Edgar Wang
f78febfa69 Fix SettingsHomepageActivityTest failed
Change-Id: I58a9e0820cc7ee55d8360ed8511ad5d9a4786830
Fixes: 341046261
Test: robotest
2024-05-16 13:36:36 +00:00
Edgar Wang
a6a4480736 Fix SettingsHomepageActivityTest failed
Fixes: 340439758
Test: atest SettingsHomepageActivityTest
Change-Id: I8f6fbb91f92982abd3b1ebadff763270537b9c3e
2024-05-15 10:35:57 +00:00
Edgar Wang
f437bec1bc Merge "Homepage UX revamp" into main 2024-05-10 00:57:01 +00:00
Edgar Wang
47400df7ae Homepage UX revamp
- unified Search and Suggestion behavior between regular phone and two
  pane
- don't adjust padding
- update new icon drawable
- support group homepage preference with round corner on phone
- Remove avator from homepage
- Adjust homepage preference order

Bug: 333989622
Bug: 334130370
Test: visual
Change-Id: I9880b52553f164745766c8b9d5c996585285e52a
2024-05-09 08:21:08 +00:00
Jason Chiu
bd74caeb99 Check whether the user is a sub profile before starting Settings homepage
Fix: 336449492
Test: atest SettingsHomepageActivityTest LocationInjectedServicesPreferenceControllerTest UserDetailsSettingsTest ActionDisabledByAdminDialogHelperTest ProfileSelectFragmentTest ProfileSelectLocationFragmentTest
- Start a managed app's info page
- Start a private app's info page
- Switch to a secondary user and start Settings
- Switch to the guest user and start Settings

Change-Id: I1c7c95d95c4739d70839a742ebc4e72b59b1d555
2024-05-02 10:17:28 +08:00
Jason Chiu
fd8c705af9 Merge "Restart or finish HomepageActivity when it's launched unexpectedly" into main 2024-04-17 01:37:23 +00:00
Jason Chiu
b0c011e077 Restart or finish HomepageActivity when it's launched unexpectedly
Settings homepage should be started with the flag FLAG_ACTIVITY_NEW_TASK
to ensure it's the first activity in a task. Otherwise, there will be UI
issues.

When homepage is started with FLAG_ACTIVITY_NEW_TASK but not the first
activity, it means another homepage activity has been started, so
finishing the current invocation will bring up the previous activity in
the task.

On the other hand, when homapage is not started with the flag and not
the first activty, it indicates that the invocation is from another
app. Restarting the homepage activity with FLAG_ACTIVITY_NEW_TASK will
keep the UI behavior consistent.

Fix: 297857732
Fix: 309045575
Test: robotest, manual
  1. Start Settings from QuickSettings, go to any subpage, navigate to
     home, click Settings icon on the launcher, and the previously
     opened page should be kept.
  2. On a LS device, start Settings from another app without
     FLAG_ACTIVITY_NEW_TASK, Settings should be started in dual-pane
     mode.
Change-Id: If1f31e26dc37f681bd97c185cbeac2de06bdd48f
2024-04-17 01:33:04 +00:00
Fan Wu
b9798f0798 Remove LoopeMode.LEGACY usage from two test classes
Bug: 330824314

Test: atest
Change-Id: I6dea662c4dea226d06b17d0d5463f01cb668a67d
2024-04-10 03:59:53 +00:00
Chris Antol
70a5a0fd35 Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes

Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
2024-03-25 23:51:04 +00:00
Chris Antol
3711945eb2 Merge "Revert "Finish HomepageActivity when it's not the root of a task and not singleTask."" into main 2024-02-28 23:20:13 +00:00
Chris Antol
778bcee157 Revert "Finish HomepageActivity when it's not the root of a task and not singleTask."
This reverts commit 5a305645c1.

Reason for revert: b/325861149

Change-Id: I4441f939a46bf65514756a015355ea5089147c1d
2024-02-28 19:56:56 +00:00
Fan Wu
2a1051cbab Merge "Update custom shadow usage of ShadowActivityManager" into main 2024-01-11 02:59:31 +00:00
Fan Wu
1ce7938afc Update custom shadow usage of ShadowActivityManager
Test: atest SettingsRoboTests

Bug: 319052511
Change-Id: I15ee6a19d039808aab5089e309a872cf6bc818bc
2024-01-11 09:45:41 +08:00
Sunny Shao
bee65b4109 Merge "Revert^2 "Nullability Annotations replacement"" into main 2024-01-10 08:35:06 +00:00
Sunny Shao
076ed573eb Revert^2 "Nullability Annotations replacement"
This reverts commit 19d1d3d15d.

Reason for revert: revert it because this is not the root cause.

bug: 316867690
Change-Id: I0f168dbb64044aa720202af7b1040afd4f028c9c
2024-01-10 07:34:01 +00:00
Sunny Shao
946f52b2a1 Merge "Revert "Nullability Annotations replacement"" into main 2023-12-29 03:18:24 +00:00
Sunny Shao
19d1d3d15d Revert "Nullability Annotations replacement"
This reverts commit cf0501e4d7.

Reason for revert: b/317462033, it seems a flaky but revert it first.

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
2023-12-29 02:28:24 +00:00
Jason Chiu
05c7b59361 Merge "Make the suggestion view dismissible" into main 2023-12-21 06:23:33 +00:00
Jason Chiu
72d638e681 Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main 2023-12-20 06:10:18 +00:00
Jason Chiu
5a305645c1 Finish HomepageActivity when it's not the root of a task and not singleTask.
HomepageActivity should be the first activity in a task, or be launched
in singleTask mode. Finishing it will bring up the previous activity in
the task.

Fix: 297857732
Test: robotest
Change-Id: Iddcba1652060d755693dd20d0e350e3d6c1ae138
2023-12-20 03:40:29 +00:00
sunnyshao
cf0501e4d7 Nullability Annotations replacement
-- Replace the android.annotation.Nullable / android.annotation.NonNull
   with androidx.annotation.Nullable / androidx.annotation.NonNull

Bug: 316867690
Test: build pass
Change-Id: I0c1da55dfb09ece855151c47e0492d6f46538621
2023-12-20 08:50:09 +08:00
Jason Chiu
dfd802da92 Make the suggestion view dismissible
The suggestion view could just be operated once to eliminate flicker.
When the suggestion is completed, there was no way to dismiss it unless
users kill Settings.

This patch allows updating the view's visibility after the activity is
stopped. When the activity restarts, the view can be updated.

Fix: 294153594
Test: robotest
Change-Id: Idc3aada3bff001d603bf2f7737f70f2880f6cc35
2023-12-19 16:12:42 +08:00
FanWu
e6d648aa40 Fix BluetoothUpdateWorkerTest.
Should avoid spying on Android classes due to potential test pollution: https://robolectric.org/best-practices/

Bug: 315399487

Test: atest SettingsRoboTests:com.android.settings.homepage.contextualcards.slices --iterations 20
Change-Id: Ia52baf52bf43d3a3959dc0234fbfc5b4a4575dac
2023-12-11 10:23:09 +00:00
Yanting Yang
033263b858 Ignore failing test of BluetoothUpdateWorkerTest
Bug: 315399487
Test: post-submit
Change-Id: I2747b45e60b7aa4d1326e8eb01bc2af8e8666030
2023-12-08 03:11:01 +00:00
Yanting Yang
bcce49defd Merge "Ignore failing test of GrayscaleConditionControllerTest" into main 2023-11-28 12:54:24 +00:00
Yanting Yang
5f7694d633 Merge "Ignore failing tests of com.android.settings.homepage.contextualcards.slices" into main 2023-11-28 12:53:39 +00:00
Yanting Yang
c681b4fdd0 Ignore failing tests of com.android.settings.homepage.contextualcards.slices
Bug: 313598030
Test: atest
Change-Id: I1a122bb0ed853a8f0665cc0f848d5b7bc0c2a113
2023-11-28 18:55:18 +08:00
Yanting Yang
8dd188ba91 Ignore failing test of GrayscaleConditionControllerTest
Bug: 313597163
Test: atest
Change-Id: I5a08d9e3a2ac8853bc9111c12388bbbb18a8079a
2023-11-28 18:27:26 +08:00
Chaohui Wang
34c4deb6c9 Clean up Contextual Wifi card
Bug: 245854887
Test: m RunSettingsRoboTests
Change-Id: I3b4ccc076a68eadc11e9fb3d2967a34fe0396cf9
2023-11-27 13:59:33 +08:00
Edgar Wang
292f407071 Fix robo test case failed
Bug: 300134365
Test: robotest
Change-Id: I144fbbc962a479c97312cee1645c5a3d70351542
2023-09-26 15:49:40 +08:00
Eric Rahm
802b922593 Revert "Test Fix SettingRobolectricTest Fail"
This reverts commit 818f77cd1f.

Reason for revert: Underlying issue fixed in ag/23454315.

Bug: b/275023433
Test: atest SettingsGlobalRoboTests

Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834
2023-09-11 13:38:36 +00:00
Rex Hoffman
3c961e1c0e Setup external/robolectric for SettingsRoboTests
Current failing tests: ab/I64100010182936387
Had to Ignore some of com.android.settings.accessibility tests, which will be fixed separately

Bug: 261728063
Test: atest SettingsRoboTests -- --test-arg com.android.tradefed.testtype.IsolatedHostTest:java-flags:-XX:CompressedClassSpaceSize=3g

Change-Id: I4a0cb992db924936826e0c9808accc78dddb5f30
2023-08-17 22:33:20 +00:00
Vincent Wang
818f77cd1f Test Fix SettingRobolectricTest Fail
Bug: b/275023433
Test: NA
Change-Id: If2dcb8f6c196327129ccc9375b190e394c994efa
2023-05-09 06:26:39 +00:00
Jason Chiu
5310c40640 Refine permission check process of 2-pane deep link
- Check the deep link activity instance before rediercting to the
  internal activity for the managed profile invocation so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Bug: 272437506
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
2023-03-27 11:59:07 +08:00
Arc Wang
c3141fa911 Settings 2-pane deep link vulnerabilities
Settings app must not start an deep link Activity if
1. The deep link Activity is not exported.
or
2. Calling package does not have the permission to
   start the deep link Activity.

Bug: 250589026
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
Change-Id: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
2022-11-29 00:10:36 +08:00
Angela Wang
e7a4b1f13d Shows LE audio hearing aid device in a11y settings page (3/3)
Shows connected hearing aid in a11y settings page whether it's ASHA hearing aid or LE audio hearing aid. Makes sure preference summary is updated as expected when BluetoothHapClient profile connects or disconnects.

LE audio hearing aid will be a CSIP set. According to the CSIP spec, we will show the device is active without side information if there is only one device in the CSIP set and show the device is active left and right if both side of hearing aids are in the CSIP set.

Bug: 249235823
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidPairingDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsRelatedToolsControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Ifd66cbd81481a1eb94613d89dfd8df16b8c43ae8
2022-11-23 07:50:51 +00:00
Yi-Ling Chuang
e3fcf1f082 Remove BatteryFixSlice as it's not used
The BatteryFixSlice hasn't been used for a while, and it's introducing
memory leaks due to a design change at the framework's end. Hence,
remove it.

Bug: 245385410
Test: robotests
Change-Id: I517cab71a32613d5cb5fcd3beb991a24926a2902
2022-11-04 12:22:56 +08:00
Arc Wang
31eec49217 [Activity embedding] Fix unexpected finished 2nd layer problem
If Settings is started on an existing task, the existing SplitPairRule
may cause an unexpected app finish while navigating back from the
2nd layer page.

This change resets SplitPairRule in onCreate().

Bug: 247080168
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
      manual
      1. Settings app -> 'Connexted device'.
      2. Launch Settings app again from Settings icon in quick Settings.
      3. Start a 3rd layer from 'Network & internet'
      4. Click back and see if the 2nd lay shows.
Change-Id: I262327cc49c3a4434a183eb00ac57f47fa598f70
2022-10-31 05:48:45 +00:00
SongFerng Wang
c150fe528d Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: I2e79ea4100840627a21bd8797c9f1875b09c9161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 06:20:37 +00:00
SongFerngWang
cefad1e4b7 Fix the testcase error
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.

Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-27 20:42:31 +08:00
xuezaiyue
ac7318419a Move battery usage files to a separate folder.
Bug: 202118250
Test: presubmit
Change-Id: I21aa58ebc02327849ed2161dbbafcdc806c007f2
2022-06-19 05:59:35 +00:00
Jason Chiu
680fce3acd Refine layouts for large screen
- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
  of being highlighted
- Add an interface to support dynamic split layout for suggestion cards

Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
2022-03-30 04:54:30 +00:00
TreeHugger Robot
1323cc25f3 Merge "Fix EligibleCardChecker test failure" 2022-02-14 04:23:00 +00:00
TreeHugger Robot
3b362e84f4 Merge "Fix SliceContextualCardRendererTest" 2022-01-24 10:34:56 +00:00
Yi-Ling Chuang
85356adb94 Fix EligibleCardChecker test failure
Use a fake slice instead of a wifi slice to decouple the dependency.

Fixes: 215046603
Test: robotest
Change-Id: I02da766007c5bb096dc0844f9ea62d0b49e1f4d6
2022-01-24 15:59:57 +08:00
Yi-Ling Chuang
beb88dc4a9 Fix SliceContextualCardRendererTest
Fixes: 215046609
Test: robotest
Change-Id: I6b48d3b0739fe64a2380426efa03acd1971cd6b1
2022-01-24 14:04:01 +08:00
Yi-Ling Chuang
62b1f71402 Fix ContextualCardsFragment test failure
Fixes: 215046286
Test: robotest
Change-Id: I930c3009891512011974aa399b9a4034d33243e5
2022-01-24 13:55:19 +08:00
Weng Su
c735f98943 Mock WifiManager.class for HotspotConditionControllerTest
Bug: 215047177
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=HotspotConditionControllerTest

Change-Id: I902383f935d38b1736e5cced388a8b164a428007
2022-01-21 08:22:59 +00:00
Tsung-Mao Fang
69a3271556 Ignore broken tests
Test: run robo tests
Bug: 215047192
Bug: 215047320
Bug: 215047319
Bug: 215046294
Bug: 215046609
Bug: 215047177
Bug: 215046603
Bug: 215046286
Change-Id: I6cfdcde663fa531754ee473421577357890ab540
2022-01-18 12:43:59 +08:00