Treehugger Robot
8852d1464c
[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: 3cd2d3b8fe -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: If70682d5bf713b0792d63f339be6015c27070fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 04:07:34 -08:00
Fan Wu
a0a32c32dd
[automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours am: 44ed327b4c -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: I6a09f83e08b791ca0ab3a012de25c1b4a78d9216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 04:07:30 -08:00
Treehugger Robot
4df8ee0043
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649 am: c9a7157c71 -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: I33192a50d4d49ed38bf3693af58514cb72c98795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 04:07:21 -08:00
Treehugger Robot
c6f3f33258
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851
Change-Id: I85e500ef02493fd5a37336b8b983312979e4e407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 04:06:05 -08:00
Treehugger Robot
1451c50e5a
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -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/+/31226851
Change-Id: Ib018070849f9cfdd309ccad457d300f635601e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 04:04:22 -08:00
Treehugger Robot
5ccbef81b8
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -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/+/31226851
Change-Id: I2cd5429035be307341db245ad64dde312ebc693b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:52:32 -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
8984963099
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -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/+/31226851
Change-Id: I4821f3d369279bb44b031895e32fead87de95382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:52:18 -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
55de28ad5f
[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours
...
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851
Change-Id: I213e8ca7c014faa461b47da068ef777882aaddf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:50:46 -08:00
Treehugger Robot
3cd2d3b8fe
[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: Ica7cf1e1a8660b9c295bdb051e0ebb780266c56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:48:29 -08:00
Fan Wu
44ed327b4c
[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: Ia03cc7dca52005f828351b222dcb6de3b67e16f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:48:23 -08:00
Treehugger Robot
c9a7157c71
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: I81c8a012a24619ecae995394561022a79fb28ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:48:10 -08:00
Pierre Barbier de Reuille
a85577054b
Desktop Experience needs the device to be eligible
...
The Desktop Experience is only available (and therefore the freeform on
secondary display disabled) if the device is eligible for Desktop Mode.
Correcting the test to make it correct.
Fix: 393547201
Test: atest DesktopModeSecondaryDisplayPreferenceControllerTest
Flag: EXEMPT (bug fix)
Change-Id: I36a031487d8a6f6d681a2cb46a1fa50e47d870cc
2025-02-01 11:31:47 +00: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
f8c6feffe5
Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851
Change-Id: Ibe53a373f1598632bd16c1e2659644d28bb1f11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:24:32 -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
007a226ba9
Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851
Change-Id: I7d226da8aef1c0823738324cd064c7ff96e0ecf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-01 03:24:14 -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
969cb7728c
Merge "Check the permission of the callingUid instead of the calling package" into tm-dev
2025-02-01 03:01:34 -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
Pierre Barbier de Reuille
2bd95dfc4d
Disable ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION
...
To avoid issues controlling when desktop mode is enabled or not.
Bug: 393404767
Test: atest DesktopModePreferenceControllerTest
Flag: EXEMPT (bug fix)
Change-Id: I67643f3fe5994dfa901b259d5c49e89f19a9210c
2025-01-31 23:37:18 +00: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
Matthew DeVore
012123b165
Do not show entry point when no CD attached
...
Do not show External Displays entry point unless one (or more) external
displays is actually attached.
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/352648432
Test: atest ExternalDisplayPreferenceFragmentTest.java
Test: attach one external display and open CD settings - verify the topology pane is shown
Test: add and remove an external display and verify the connected device entry point is added and removed
Change-Id: If263e98aeaf7be2778c1e8a1cbafc7e2345bb0c5
2025-01-31 18:50:20 +00: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
Matías Hernández
2a6672dd33
Remove incorrect call to Window.addFlags with a system flag
...
The same flag is being (correctly) added in onCreate, so on top of being wrong this was also completely unnecessary.
Bug: 368579654
Test: manual
Flag: EXEMPT bugfix
Change-Id: I539fca77a1d136bdd0e4892993020884430b8a4e
Merged-In: I539fca77a1d136bdd0e4892993020884430b8a4e
(cherry picked from commit e0510a62eb )
2025-01-31 03:57:14 -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
yomna
3e071f055e
Fix missing controller key and remove onCreatePreferences
...
1) A missing controller key for CellularSecurityEncryptionDividerController
was causing the corresponding UI element's getAvailabilityStatus to not
be called. 2) The inclusion of onCreatePreferences in
CellularSecuritySettingsFragment was causing other UI element's
controllers to not be called correctly.
Bug: b/373942609
Test: atest CellularSecurityPreferenceControllerTest
Test: atest CellularSecurityEncryptionDividerControllerTest
Flag: EXEMPT bugfix
Change-Id: Ic01a609311d7bd84ee835ffbede793fe2d7756ae
2025-01-31 01:25:46 +00:00
Bill Yi
acf28a7542
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9a58649febfee6880cf03915f924a70a962d6a9
2025-01-30 16:04:22 -08:00
Bill Yi
740b1f6e21
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I06e6c13e70b3df4a46f0f6b4ab74913de5ebd11f
2025-01-30 16:02:20 -08:00
Bill Yi
304f8c3d98
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I453d6969d1c4f43d09157062ca6abc689b59cbe9
2025-01-30 16:00:41 -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
Fiona Campbell
fc94995307
Make Extra Dim Setting as percentage of device
...
- Extra dim setting now operates in percentage of the device's
capabilities
- ie "100" now means the maximum possible dimming on the current device,
if restored to another device, this means the max possible dimming on
that device as well.
Bug: 337351445
Flag: EXEMPT bugfix
Test: atest DisplayServiceTests
Test: atest ReduceBrightColorsIntensityPreferenceControllerTest
Change-Id: I98d0d7af562fdfb2b921746e0e5654bad47b440b
2025-01-30 15:47:27 +00:00