Treehugger Robot
a05609a68a
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b
-s ours am: 78f62d8269
-s ours am: e5a837a9d8
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830
Change-Id: If3f51a0cd31f94cde5abd59503fed5672de6f9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 04:19:10 -08:00
Fan Wu
ca068c9cea
[automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08
-s ours am: 81a5d7b696
-s ours am: 82d37340b5
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830
Change-Id: I86143c1d0ba64f156ef4bf6eaf11bad75e49822e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 04:19:05 -08:00
Treehugger Robot
b7ce11b8e2
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649
am: d95916adb5
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 201d7ffac4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833
Change-Id: Ied53c521712642c86285c4db0e80969a72860501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 04:18:52 -08:00
Treehugger Robot
e5a837a9d8
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b
-s ours am: 78f62d8269
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830
Change-Id: I2970c99575de748f8ee3bc8b7f6807fd321af11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:52:23 -08:00
Fan Wu
82d37340b5
[automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08
-s ours am: 81a5d7b696
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830
Change-Id: I7fd0cb6aeeaceafb9736eed5c1348c27f7ebbbd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:52:20 -08:00
Treehugger Robot
d95916adb5
Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833
Change-Id: I589e0940eba59d1696d4b3d0ec32b0ff19ac447f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:52:09 -08:00
Treehugger Robot
3d6aa9048e
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-qpr-dev am: 6cd8230cbb
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 e719575e92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226854
Change-Id: I9a760db5f4bc94e426d5294a79a10cba81c40def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:25:45 -08:00
Fan Wu
00946da33f
[automerger skipped] Check the permission of the callingUid instead of the calling package am: 201d7ffac4
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 e719575e92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226854
Change-Id: I935567c7d2ed762cee8daab7dbcd893bc0f0736f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:25:40 -08:00
Treehugger Robot
78f62d8269
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830
Change-Id: I8e37a5fa6f1b917128963457f18046d8540476dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:24:23 -08:00
Fan Wu
81a5d7b696
[automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08
-s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830
Change-Id: I98d55f743c385681f5a0d8d43dc516852c8a8cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:24:17 -08:00
Treehugger Robot
54ee76b649
Merge "Check the permission of the callingUid instead of the calling package" into udc-dev
2025-02-01 03:09:33 -08:00
Treehugger Robot
b9c5239b5b
Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev
2025-02-01 03:04:56 -08:00
Treehugger Robot
6cd8230cbb
Merge "Check the permission of the callingUid instead of the calling package" into udc-qpr-dev
2025-02-01 02:58:50 -08:00
Treehugger Robot
24fe6d9fe9
Merge "Revert "Use BatteryOptimizeUtils to add packageName into PowerSaveWhitelistUserApps allowlist, which will set app into Unrestricted Mode"" into main
2025-01-31 14:46:38 -08:00
Zhou Liu
8dc9b53328
Merge "Create "Change PIN" settings UI" into main
2025-01-31 14:13:12 -08:00
Matthew DeVore
dca3f94f12
Merge "Clip display blocks in the topology pane" into main
2025-01-31 12:28:11 -08:00
Zhou Liu
827d662460
Create "Change PIN" settings UI
...
Test: atest SupervisionChangePinPreferenceTest
Test: manually on real device
Bug: 393193125
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Change-Id: I9a9af5d502c45a7710bcb73455eae9a828f0f721
2025-01-31 20:26:53 +00:00
Treehugger Robot
9e51bf40ac
[automerger skipped] Merge "Allow system services to be optional" into main am: 55b0bcd8cb
am: 184aee6710
-s ours
...
am skip reason: Merged-In I761054caebe3e846f5c6c76e2818662aad2cb511 with SHA-1 5a594828d7
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3462915
Change-Id: Iac2445a670d7304bb58d1eba47b1d433ce6c9955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-31 11:09:20 -08:00
Treehugger Robot
184aee6710
Merge "Allow system services to be optional" into main am: 55b0bcd8cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3462915
Change-Id: I65cc32fb79196054fb4115722b04771425368d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-31 10:46:07 -08:00
Matthew DeVore
d73552fca5
Merge "Simplify pane sizing and scaling algorithm" into main
2025-01-31 10:30:40 -08:00
Treehugger Robot
55b0bcd8cb
Merge "Allow system services to be optional" into main
2025-01-31 10:04:14 -08:00
Treehugger Robot
089ce7465d
Merge "Flag cleanup in Settings: keyboard_layout_preview_flag" into main
2025-01-31 09:02:36 -08:00
Treehugger Robot
8a53aecafe
Merge "Support finishing Fingerprint Settings if TIMEOUT" into main
2025-01-31 05:53:12 -08:00
Wesley Wang
b7783cb6c9
Revert "Use BatteryOptimizeUtils to add packageName into PowerSaveWhitelistUserApps allowlist, which will set app into Unrestricted Mode"
...
This reverts commit 1b83703adc
.
Reason for revert: locating b/393033745 root cause
Change-Id: I04f90b42907d07c6111a7b41a531f7717df33672
2025-01-30 22:48:49 -08:00
Matthew DeVore
fe0c780928
Merge "Make topology hint readable when block is under it" into main
2025-01-30 14:52:19 -08:00
Matthew DeVore
a23e3cb774
Simplify pane sizing and scaling algorithm
...
Simplify the scaling parameters and algorithm and reduce vertical
padding.
Originally a maxBlockRatio was specified at .12, which would have
caused a block length to typically be 2560 * 0.12 = 307. However, this
fails to account for smaller displays and high-DPI displays which have
smaller dip dimensions. So instead choose a maximum edge length of
256dp, which I have found to give good results on a laptop device
and a high DPI tablet, and which does not assume typical sizing for
configured displays, and still accomplishes the purpose of limiting
scrolling and dragging size.
Using the aspect ratio of the display bounds in setting the height
frequently caused a very large amount of padding, and limiting based on
the max block height only reduced it slightly. Now we set the vertical
height based on the minEdgeLength. This length is considered the
smallest size that can be comfortably interacted with, and we use it to
give ballpark ideal padding size.
Note that the unit test cases have increased pane height but in
practice (real-world pane width and constraints) this change seems to
decrease the pane height in general.
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/352650922
Test: atest DisplayTopologyPreferenceTest.kt
Test: atest TopologyScaleTest.kt
Test: compare appearance on mid-dpi and high-dpi screens with a single 1080p external display, or with two external displays of smallish logical size
Change-Id: Id189892c88a1e833c1f54b0e5447a15f92e3310f
2025-01-30 20:37:03 +00:00
Jack Yu
3d0d0f9d66
Merge "Cleaned up the flag enable_identifier_disclosure_transparency_unsol_events" into main
2025-01-30 12:18:58 -08:00
Guojing Yuan
69f3696e4f
Merge "[CDM] Checks NLS component name instead of package name" into main
2025-01-30 09:05:26 -08:00
Hani Kazmi
95aa9f0093
Merge "[AAPM] Add help uri" into main
2025-01-30 08:56:55 -08:00
Hani Kazmi
3bfa1734b4
[AAPM] Add help uri
...
This URL is used by the Advanced Protection dialog to point users to the
AAPM settings page. The resource is empty by default and should be
overriden to get the "Learn More" link to show
Bug:389080341
Test atest GtsFeaturesTestCases
Flag: EXEMPT resource only
Change-Id: I3a9b02c33ba1366a4ca9539f41c0a7da2cac030b
2025-01-30 08:55:54 -08:00
Shawn Lin
e06acaab1d
Merge "Fixed userId not updated when user changed" into main
2025-01-30 05:44:44 -08:00
Aishwarya Mallampati
b6a964815e
Merge "Do not show satellite messaging in sim settings if sms is not supported" into main
2025-01-29 23:07:15 -08:00
Treehugger Robot
2d8cd122e4
Merge "Explicitly keep default constructor in rules without members" into main am: cfc4d29e89
am: 7b2b283d00
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3438521
Change-Id: I61a07cadccd4b7f143c883d8e27342d857694456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-29 23:06:03 -08:00
Treehugger Robot
7b2b283d00
Merge "Explicitly keep default constructor in rules without members" into main am: cfc4d29e89
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3438521
Change-Id: Ifbe6a637d95fda5346b93c8c86f175b9463ecde2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-29 22:42:06 -08:00
Treehugger Robot
cfc4d29e89
Merge "Explicitly keep default constructor in rules without members" into main
2025-01-29 22:17:01 -08:00
Shawn Lin
43b3159db2
Fixed userId not updated when user changed
...
The userId for "Unlock your phone" & "verify it's you in app" settings
in face setting page are not updated correctly when user changed.
Bug: 393236814
Test: Manual - go face settings and enable/disable these two button
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I840eaaab13b8ad9f4e79ae2cf2e47dd22ed2ff8b
2025-01-30 04:13:19 +00:00
Aishwarya Mallampati
d7769ad180
Do not show satellite messaging in sim settings if sms is not supported
...
Bug: 393181741
Test: 393186308
Flag: EXEMPT bugfix
Change-Id: I1cb1d22541ba68ce20a0fd9319ddb2d5fc5d6715
2025-01-29 23:27:36 +00:00
Matthew DeVore
015d944238
Make topology hint readable when block is under it
...
Using the topology pane background color, draw a background behind the
hint text view.
Test: manual
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/352650922
Change-Id: I7fcee61d53460976b7d5eb10148d79bd2f9252ad
2025-01-29 22:13:59 +00:00
Jack Yu
6e26457b84
Cleaned up the flag enable_identifier_disclosure_transparency_unsol_events
...
Cleaned up the 24Q3 flag
enable_identifier_disclosure_transparency_unsol_events
Bug: 276752426
Test: Basic telephony functionality tests
Test: atest FrameworksTelephonyTests
Flag: EXEMPT removing flag
Change-Id: Ia96d406bd354f766e57363b74700ca07ac79c895
2025-01-29 14:07:28 -08:00
Pierre Barbier de Reuille
574ba31dd3
Merge "Update when Desktop Mode Dev Option is enabled by default." into main
2025-01-29 12:39:46 -08:00
Yomna N
aea18e40d0
Merge "Fix broken Safety Center redirect when SafetySourceData is null" into main
2025-01-29 12:13:17 -08:00
Shawn Lin
99ff9245a6
Merge "[Gaze] Support Gaze" into main
2025-01-29 06:40:44 -08:00
Vaibhav Devmurari
9ffa4d241f
Flag cleanup in Settings: keyboard_layout_preview_flag
...
Test: manual
Bug: 293579375
Flag: EXEMPT cleanup
Change-Id: I1f13ab0ab46883622d024f982faba26b1dce0152
2025-01-29 03:54:40 -08:00
Pierre Barbier de Reuille
0a49a01210
Update when Desktop Mode Dev Option is enabled by default.
...
The new condition requires accessing the context.
Bug: 382238347
Flag: EXEMPT Bug fix
Test: atest DesktopModePreferenceControllerTest
Test: Build and test on devices with only the dev option enabled.
Change-Id: If9cacea948ccee2bc5a5b4fae07f3ad69efb0af2
2025-01-29 10:35:37 +00:00
Jack Yu
5161aff82e
Merge "Cleaned up the flag enable_identifier_disclosure_transparency" into main
2025-01-28 18:09:37 -08:00
Riley Jones
6e12194015
Merge "Disabling elements on the A11y Shortcut setting subpage" into main
2025-01-28 13:24:42 -08:00
Matthew DeVore
d2ed0a84dd
Clip display blocks in the topology pane
...
Prevent display blocks from overflowing outside the pane when dragged.
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/352650922
Test: drag a display block so that it would overflow outside the pane
Change-Id: I326cb28f06914f71535906a0ce3e8fc04a4cb4f3
2025-01-28 14:01:29 -06:00
Guojing Yuan
f5ed187ffb
[CDM] Checks NLS component name instead of package name
...
Bug: 386216637
Change-Id: I1be52fcb3d52b8b84353ea00fd57d8360ddd966c
Flag: EXEMPT bugfix
Test: CTS
2025-01-28 11:57:16 -08:00
Matthew DeVore
ec58402c03
Merge "Apply display density to topology pane scaling" into main
2025-01-28 11:39:34 -08:00
Bill Yi
4170e612ee
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2025-01-28 11:19:31 -08:00