Commit Graph

222 Commits

Author SHA1 Message Date
Graciela Wissen Putri
ac2bfce107 Change title to aspect ratio (experimental)
Settings > Apps > Aspect ratio (experimental)
Settings > Apps > App info > Aspect ratio (experimental)

Fix: 300219974
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:83b61850f3ed511b42c148b63840b12cff3fe5aa)
Merged-In: I359c744025232c6a6ebd9628dbf91acac85b53e9
Change-Id: I359c744025232c6a6ebd9628dbf91acac85b53e9
2023-09-20 21:45:06 +00:00
Charlotte Lu
0ce7202d7a Use flag to switch to the new UI.
Bug: 194175217
Test: Munual
Change-Id: Ie3047cebd4a79dea07614b48ad33ba759802cbe8
2023-09-18 12:03:27 +08:00
Graciela Putri
13821ceb45 Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev am: 263126b580 am: 285a139c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24757660

Change-Id: I7fd06c631b9ad2ffd1749ec05f074883e730fe01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:52:37 +00:00
Graciela Putri
285a139c6f Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev am: 263126b580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24757660

Change-Id: I07abbfb97702a0c96ee3f3a80d13fc167c4bf978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 09:14:58 +00:00
Graciela Wissen Putri
7889f55f3d Remove moreOptions in aspect ratio settings
System apps that are not visible in Home/Launcher are already excluded
by default.

Fix: 299924064
Test: Manual
Change-Id: Ia5972f23b1a9dd2f6dda65fb02784fe722e7a63a
2023-09-14 13:23:09 +00:00
Graciela Putri
a727cea119 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4 am: f862ff58f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I0ba709c1187c099e5eccc9a4e0ab69d5559f9336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 08:54:57 +00:00
Graciela Putri
f862ff58f0 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I1fcf366127ea502b3351c8f6a94d601281df4a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:58:10 +00:00
Graciela Putri
dd34fa54e4 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev 2023-09-13 07:14:13 +00:00
Graciela Wissen Putri
c37c8b8789 Change aspect ratio summary and footer text
Add more education for device user that setting aspect ratio has not
been tested by the app developer. Move Aspect ratio under Apps >
Advanced instead of General.

Fix: 296160724
Test: atest UserAspectRatioAppsPageProviderTest
Change-Id: I2078f285d7bfb8de3a61c69f9d0ff3872d683ed4
2023-09-12 16:56:10 +00:00
Massimo Carli
e3c53f39a3 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355 am: 7d297719d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236

Change-Id: I75fbcbb10b149bc16b2deead7645df992572e7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 12:11:47 +00:00
Massimo Carli
7d297719d7 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236

Change-Id: I8e95d9e9704649cbcb3eed980e3d0275116b4c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 11:16:24 +00:00
Massimo Carli
24aa9c8f15 Changed app string changes in user aspect ratio settings
Bug: 297288214
Test: Manual

Change-Id: I72c0b53d8d9db92b12d4e9507fcf40b1be76d745
2023-09-12 06:29:19 +00:00
Graciela Putri
ab7f57b17c Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev am: 83c8f47ddd am: 725efb1a5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309274

Change-Id: I5cdb28b8929b0ab8dba829ee6e12d880ca6cc27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:04:50 +00:00
Graciela Putri
725efb1a5a Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev am: 83c8f47ddd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309274

Change-Id: Ic2222519338f30df3d6dd5fea2df5b99bc4eb931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:20:48 +00:00
Graciela Wissen Putri
08983e8e63 Add opt-out properties for aspect ratio settings
Don't display aspect ratio options if app has opted out. If app has
opted out only for fullscreen, other aspect ratio options should still
be shown.

Bug: 292583399
Test: UserAspectRatioManagerTest
Change-Id: Ia0b223536407f703826d775468c8f8a0b4822e23
2023-08-15 09:14:21 +00:00
Colin Cross
84f8961e67 Fix kotlin nullable errors in Settings
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-08-14 12:30:16 -07:00
Colin Cross
87b870a090 Fix kotlin nullable errors in Settings
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-08-14 12:29:02 -07:00
Chaohui Wang
2910d68343 Remove ExperimentalLifecycleComposeApi
Fix: 276310170
Bug: 271609607
Test: m Settings
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
(cherry picked from commit 8d220f0641)
2023-08-10 21:55:19 +00:00
Graciela Putri
3893f2f04f Merge "[5/n] Add graphics to app aspect ratio options" into udc-qpr-dev am: 16f8639404 am: dcb788bded
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24224466

Change-Id: I45121c984d646ca49eb0469bcd2b33d6331d9677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 20:40:59 +00:00
Graciela Wissen Putri
5b97e3ecda [5/n] Add graphics to app aspect ratio options
Static assets in Apps > App Info > Advanced > Aspect ratio
Animation in Apps > Aspect ratio

Bug: 293138315
Test: Manual
Change-Id: Ia0d5e9ab3435b395284701a2d915c9cb454593c0
2023-08-09 13:33:06 +00:00
Anvesh Renikindi
d811e2b515 Merge "Remove ExperimentalLifecycleComposeApi" into main 2023-08-08 20:33:33 +00:00
Chaohui Wang
2541381259 Fix references to resources for Settings
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
2023-08-08 01:56:05 +00:00
Yanting Yang
f5e74b8f49 Merge "Support App details for work profile apps" into main 2023-08-02 20:12:32 +00:00
Yanting Yang
6b02225810 Support App details for work profile apps
App info page stopped supporting the App details feature for work
profile apps in Android N but there is no exact reason from the history.
Try supporting it again to fulfill users' requests and check for
exceptions.

Bug: 264932611
Test: manual & robo and unit tests
Change-Id: I1227cff5e25313905952ba54ab0270cdf4f00fd4
2023-08-01 20:49:24 +08:00
Chaohui Wang
8d220f0641 Remove ExperimentalLifecycleComposeApi
Fix: 276310170
Bug: 271609607
Test: m Settings
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
2023-08-01 11:13:09 +00:00
Graciela Putri
9cba6cf4b9 Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev am: 386b02e906 am: e5e57a8d9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819685

Change-Id: I0a880774214c804f2c22fb7aa876c39349e71b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:32:46 +00:00
Graciela Wissen Putri
57984f02d5 [3/n] Add aspect ratio app info page
Apps > App Info > Advanced > Aspect ratio

Adds link from aspect ratio app list page to app info. Stops activity if
user chooses a different aspect ratio override.

To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Bug: 287448187
Test: Manual
      All Settings CUJs passed
      atest SettingsRoboTests:UserAspectRatioDetailsTest
      atest SettingsSpaUnitTests:UserAspectRatioAppPreferenceTest
Change-Id: Id47f291459e62267bf15d629c163dde73d96928a
2023-07-28 09:53:11 +00:00
Chris Antol
993e1cec1f Storage Apps Lists SPA migration
Pending task to support Sorting by Name which is currently not possible given existing SPA infra

Bug: 284032857
Bug: 284032898
Test: Unit Test. Uncomment lines and tested Settings>Storage>Apps and Settings>Storage>Games
Change-Id: I93853ed7184808a083b66ba5b03f9fe3acf48d41
2023-07-21 23:52:27 +00:00
Graciela Putri
8dffd59e3d Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev am: 4e86d0d6b3 am: dc86dbe24b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819684

Change-Id: If7c6f4fa26ea014e40e737f07daae8b72481e2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 22:58:58 +00:00
Graciela Wissen Putri
b4c4f6cbe6 [2/n] Add aspect ratio app list page under apps
Apps > General > Screen Size

To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Fix: 287448088
Test: Manual
      atest AspectRatioAppsPageProviderTest
      atest AspectRatioUtilsTest
      All CUJs passed in go/settings-cujs
Change-Id: I4de6c3cbdbdfbc79ed839ec149fb633344dcd3a7
2023-07-21 08:02:09 +00:00
Sunny Shao
4d00821093 Fix the Protocol buffer best practice warnings problem
- Add prefix for the items of the SessionType enums.

Fixes: 287363023
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: Ifde0b61a05b1257edaca54325a72dad333e43e3c
2023-07-20 21:48:22 +08:00
Chaohui Wang
03959986c4 Rename to AppListTwoTargetSwitchItem
From AppListSwitchItem.

Bug: 201358903
Test: manual - on App Notification page
Change-Id: Ie2350e24b26a74040a29043e77d8b0b44df6b92a
2023-07-18 15:24:55 +08:00
Chaohui Wang
778c2dc3d5 Remove context from applicationFeatureProvider
ApplicationFeatureProvider is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I7f8dfe5716b7b55e0ff984f7603875d7896e2313
2023-07-03 13:54:26 +08:00
Chaohui Wang
8f0b2d15c6 Clean up Kotlin FeatureFactory.getFactory(context)
Replace with featureFactory.

Bug: 286764889
Test: m Settings
Change-Id: I30bd2e9b25e1681d7694939dd8ec84fcd6fd7c08
2023-06-29 23:10:37 +08:00
Chaohui Wang
f355bc2e01 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 am: 78981afdc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I09189fc2dfe6789db9c7745dd43cf5168c2e9dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 09:24:26 +00:00
Chaohui Wang
782df5c6bf Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev am: 9aa7466cf2 am: afab1d4250
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467963

Change-Id: I772a13b9d70d253c3e63b05bb25b0619823d811c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 10:39:10 +00:00
Chaohui Wang
ed6d6c9e0f Migrate PlatformCompat App List to SPA
So hidden modules are not shown in the list.

This will also improve the developer experience.

Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
2023-06-15 09:37:11 +00:00
Chaohui Wang
9aa7466cf2 Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev 2023-06-15 09:29:39 +00:00
Chaohui Wang
14f7f6c818 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3f05e59982
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I0837bd1fd686f4d77c148a2405fe5ae8a644ac99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 18:04:47 +00:00
Chaohui Wang
d9efea9f79 Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I51a7c6cf0387b9dbe8a470a8aa2afa5b5695745f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:56:53 +00:00
Chaohui Wang
9ab4ef224e Hide Show System on SPA version App languages
To align with non-SPA version.

Fix: 285264906
Test: Visual check on App languages
Change-Id: I7f8b0aec0e33fcb46939075458a8b0a710fac640
2023-06-01 09:20:42 +00:00
Chaohui Wang
b3a236d703 Remove primaryUserOnly param from UsageStats
UsageStats App List will then has same behavior as other App Lists,
can show apps from work profile.

Bug: 284902200
Test: Manually on device with Headless System User Mode
Change-Id: Ibaf9a01b8d82c342a3aab73bafc9925c4b2ac146
2023-05-30 03:21:14 +00:00
Chaohui Wang
516503df0a Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ia5aaf1c116abef625c43a63619636b18cfe6515f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:31:52 +00:00
Chaohui Wang
2a9188e67e Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: 2c4c75ebc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ida03b8db306928177905957266b147166e43c55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:27:17 +00:00
Chaohui Wang
ce56dcc30b Fix crash of PictureInPicture
This follows change I3115cf1b99a305efef192a0dcf3e809eb7903d0a

PackageManager.getPackageInfoAsUser() will throw exceptions when the
package is too large which is a known issue to PackageManager but very
low priority given resourcing constraints. As per the PackageManager
team suggestion, catch the exception on the app side to alleviate the
impact to the PictureInPicture & App info page.

Fix: 283076353
Fix: 283354211
Test: Unit test
Change-Id: Iad2bf9fbfca6ee7f604fec1c4afa1b9382f6ec7e
2023-05-24 19:41:20 +08:00
Chaohui Wang
112e3233fd Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 3d06aec9ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: I2626fc0a38e21f319a50f413203b0aae086f3ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 09:21:43 +00:00
Chaohui Wang
b39729c7aa Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 48c93451a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: I07bddd6922e9aea9270eeb9d769ee6b63f46dafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 09:18:56 +00:00
Chaohui Wang
7c042f374b Merge "FRP bypass defense in the Settings App for SPA" into udc-dev 2023-05-05 07:57:39 +00:00
Chaohui Wang
e790765a05 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: 534f046035
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: Ic93c794cabf05b997b980fc00111d67ac2f035cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 04:19:30 +00:00
Chaohui Wang
2adf3aa527 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: 8b550ddb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: I84a2cf46197e91fc0e840f7916fa34434914b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 03:35:22 +00:00