Commit Graph

7281 Commits

Author SHA1 Message Date
Lucas Silva
aa2f152da8 Merge "Cleanup dream complication setting to reflect single toggle users see in Settings." into tm-qpr-dev am: e16a86cf1c am: b0686e0194
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19699462

Change-Id: I13870fda358546ccd260d3829e12794f5eecf010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 14:45:51 +00:00
Lucas Silva
b0686e0194 Merge "Cleanup dream complication setting to reflect single toggle users see in Settings." into tm-qpr-dev am: e16a86cf1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19699462

Change-Id: I95e0810838925833e869ed171bdafdd4b34dfe87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 14:16:59 +00:00
Lucas Silva
07cfa206f4 Cleanup dream complication setting to reflect single toggle users see in
Settings.

The original implementation was designed to allow users to individually
enable/disable certain complications. However, we have since decided to
simplify the complication controls around a single master toggle. This
fixes an issue where when new complications are added, we will no longer
switch the toggle to off in Settings.

Bug: 241469874
Test: atest ComplicationTypesUpdaterTest
Test: atest DreamBackendTest
Test: manually on device
Change-Id: I1bbfbbe2abd6398b74bcd0b9ba601583a1403bef
2022-08-23 12:06:04 -04:00
Michael Mikhail
bb3501c4e7 Merge "Add media on lock screen setting" into tm-qpr-dev am: c24db189bf am: 5228968a74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19472070

Change-Id: I71156cec0a680d9403c3e5126ae188216f56fb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 15:22:40 +00:00
Michael Mikhail
5228968a74 Merge "Add media on lock screen setting" into tm-qpr-dev am: c24db189bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19472070

Change-Id: I2bb99a98c7c683f86157e00553ecc47cf276f4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 15:04:04 +00:00
Michael Mikhail
e9a364e665 Add media on lock screen setting
Add a new setting that controls whether media on lock screen is enabled,
disregarding the notifications status. The new setting is available
under media and privacy settings.

Bug: 229915240
Test: atest MediaHierarchyManagerTest
Test: atest KeyguardMediaControllerTest
Change-Id: I6adaa00ead1660488e4114d303c4394751ff87e8
2022-08-19 18:45:24 +00:00
Lauren Winston
b3403373ea Merge "Add Settings.Secure values for Software Cursor settings for hiding trigger hints and for shifting the trigger region when the keyboard is opened." 2022-08-19 17:14:51 +00:00
Lauren Winston
36e81f298f Add Settings.Secure values for Software Cursor settings for hiding
trigger hints and for shifting the trigger region when the keyboard is
opened.

More context for these settings: https://docs.google.com/document/d/1hh2eY1a6wsOmOajxOUm8Xt8DT29oUvH9x0mCH83pnvk/edit#heading=h.e572ymeclvtl

Bug: 242218807
Test: SettingsBackupTest
Change-Id: I67e6d1ed0261a592aba0cb75a8e900c07683f667
2022-08-18 21:09:45 +00:00
Richard Chang
27ede8767f Merge "Add DeviceConfig namespace for Vendor System Native Boot" into tm-qpr-dev am: 62c2538016
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19604137

Change-Id: Id0d1887e8d8705afc4a68065d722d00efdc43c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18 14:23:07 +00:00
Richard Chang
62c2538016 Merge "Add DeviceConfig namespace for Vendor System Native Boot" into tm-qpr-dev 2022-08-18 13:58:18 +00:00
Tyler Freeman
d897158618 Merge "feat(magnify): add window magnification settings panel UI" 2022-08-16 21:04:53 +00:00
Hyunki Kim
186ff1690c feat(magnify): add window magnification settings panel UI
Using option panel, user can change window magnification options(change size, scale, allow diagonal scrolling)
When turn on change size, user can change window magnification size by dragging the edge of the window or 3 type size.
and turn on allow diagonal scrolling feature, user can move the window diagonally
and can change scale

Feature cherry-picked from https://partner-android-review.googlesource.com/c/platform/frameworks/base/+/2235963

Test: unit and manual

Bug: b/188136191

Change-Id: I4f045c5c334ba4c99c893bdbc44f2c1f62cd9067
2022-08-16 13:22:46 -07:00
Richard Chang
369a102e2d Merge "Add DeviceConfig namespace for Vendor System Native Boot" 2022-08-16 08:57:09 +00:00
Josh Yang
c3936d91c1 Merge "Remove unused setting WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT" 2022-08-12 18:48:19 +00:00
Richard Chang
2ccae742a9 Add DeviceConfig namespace for Vendor System Native Boot
Bug: 241730607
Test: Build
Change-Id: I568e5e98d1af602ce363962341c5655085aa2ab7
Merged-In: I8cd86f14d5aec72cdf93985217e501ad7d13a229
2022-08-12 17:35:01 +00:00
Richard Chang
8ef59a139e Add DeviceConfig namespace for Vendor System Native Boot
To avoid conflicts, merge master first then cherrypick to tm-qpr-dev.

Bug: 241730607
Test: Build
Change-Id: I8cd86f14d5aec72cdf93985217e501ad7d13a229
2022-08-12 17:28:13 +00:00
Ats Jenk
93d34df27a Merge "Core changes to support desktop mode option" into tm-qpr-dev am: 86b968c0c9 am: 7f786f5e3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18975016

Change-Id: Ie5303001ba4b75ce7d35b3ebf0a88b3f6675258d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 17:06:30 +00:00
Ats Jenk
7f786f5e3c Merge "Core changes to support desktop mode option" into tm-qpr-dev am: 86b968c0c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18975016

Change-Id: Ic5ba63af426fc20349761b01bc6860edd2c76bb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 16:40:24 +00:00
Josh Yang
c0cbf685cf Remove unused setting WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT
This setting is replaced by device config flag. So it's no longer
needed.

Bug: 196111331
Test: device build successful
Change-Id: I7d4fc7d8666281cdef9438dd2df406428806b767
2022-08-12 00:57:28 +00:00
TreeHugger Robot
9ecc5a0017 Merge "Revert "Revert "Turn on TARE by default.""" 2022-08-11 18:51:31 +00:00
Harshad Dhabu
3f58fb59b9 Merge "Add new key EARLY_UPDATE_STATUS to Settings Provider" 2022-08-11 18:19:08 +00:00
Ats Jenk
e03065a00c Core changes to support desktop mode option
Internal system setting for enabling desktop mode prototype behavior.
This setting is triggered initially by a developer tile.
WM Shell in SystemUI will be listening for changes to this setting and
update the windowing mode respectively.

Bug: 241944030
Test: atest SettingsBackupTest
Change-Id: Ie7172d602b55e079b1fac4c83886f00cbb9baa18
2022-08-11 08:55:35 -07:00
Harshad Dhabu
53740204b2 Add new key EARLY_UPDATE_STATUS to Settings Provider
DD: go/wear-dd-early-updates

This CL pulls in changes from ag/16838775 and ag/17944526
for frameworks/base project.
Bug: 228080209
Bug: 217656696

Change-Id: Ia492c12798404d6d8abc8139f738d6d77bf3cb61
(cherry picked from commit eb7f8c41496eb30a22b1c9d256adf8602a9d1f92)
2022-08-10 20:41:50 +00:00
Mihir Patel
9064a4ef80 Merge "Reporting the Autofill IDs and Positions of active views in list view" into tm-qpr-dev am: 25192d7d0c am: f333fa0c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19054708

Change-Id: I2cbfe0cea3466bf0da1119ee9de1e52152ce6694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 18:07:43 +00:00
Kristi Saney
f6a9009aee Merge "Add secure settings key for software cursor." 2022-08-10 18:02:44 +00:00
Mihir Patel
f333fa0c93 Merge "Reporting the Autofill IDs and Positions of active views in list view" into tm-qpr-dev am: 25192d7d0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19054708

Change-Id: I6b8ffade431d057334147ae9cd5386afbad13cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 17:41:15 +00:00
Mihir Patel
25192d7d0c Merge "Reporting the Autofill IDs and Positions of active views in list view" into tm-qpr-dev 2022-08-10 16:35:13 +00:00
Mihir Patel
a6e0f74c90 Reporting the Autofill IDs and Positions of active views in list view
Test: atest CtsContentCaptureServiceTestCases, observed events reported only once on scroll and stop as well as on fling
Bug: 211899037
Change-Id: Id67fcc360bf63fcab1d9f345c31d2bf7b9a173d6
2022-08-09 15:37:50 -07:00
Kristi Saney
fb43f54289 Add secure settings key for software cursor.
Context for this setting: https://docs.google.com/document/d/1hh2eY1a6wsOmOajxOUm8Xt8DT29oUvH9x0mCH83pnvk/edit#heading=h.e572ymeclvtl

Bug: 240718050
Test: SettingsBackupTest

Change-Id: I325cff738116887f65d6254703b4ce14328c7d86
2022-08-09 21:45:24 +00:00
Kweku Adams
3acb05b9ca Revert "Revert "Turn on TARE by default.""
This reverts commit 8f906c80ad.

Reason for revert: Original revert was not needed. Behavior change was expected.

Change-Id: I15aa9e0695228a5fa17f59ce79ae8dd47812e537
2022-08-08 18:37:01 +00:00
TreeHugger Robot
da29e3e38b Merge "Revert "Turn on TARE by default."" 2022-08-05 18:51:33 +00:00
Kweku Adams
8f906c80ad Revert "Turn on TARE by default."
This reverts commit 00eef6e5be.

Reason for revert: http://b/241284782

Change-Id: I6a30da8227589c640ff16e264b50383e1fd5716b
2022-08-05 13:50:06 +00:00
TreeHugger Robot
8094e1199d Merge "Turn on TARE by default." 2022-08-03 17:28:43 +00:00
Josh Yang
bf15fd7fdb Add name space "wear" to DeviceConfig
Bug: 196111331
Test: build success
Change-Id: Ief2c72d08294b8604907fb52fa8d2eaeedc5f406
2022-08-02 14:28:50 -07:00
Kweku Adams
00eef6e5be Turn on TARE by default.
Bug: 240726265
Test: atest CtsAlarmManagerTestCases
Test: atest CtsJobSchedulerSharedUidTestCases
Test: atest CtsJobSchedulerTestCases
Test: atest CtsUsageStatsTestCases
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/alarm
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/tare
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/tare
Change-Id: I67d60ec7e7787cfb8284e5dd4b6aaacb4f03ba82
2022-08-01 19:34:03 +00:00
Joshua Mccloskey
315f6f124d Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64cfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19039844

Change-Id: I0e5645ff7a507ebd9c8c29f347ed6e45f3f365d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 20:56:14 +00:00
Joshua Mccloskey
2ff2a64cfe Merge "SideFPS UX updates" into tm-qpr-dev 2022-07-26 20:34:50 +00:00
TreeHugger Robot
57b0b38b61 Merge "Add dock charging state into stay awake feature (2/2)" into tm-qpr-dev am: db8dacec8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19116650

Change-Id: I3e07127a49dedb42f441a70e9555fdfb182d00f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 16:37:11 +00:00
TreeHugger Robot
db8dacec8a Merge "Add dock charging state into stay awake feature (2/2)" into tm-qpr-dev 2022-07-26 15:42:36 +00:00
TreeHugger Robot
d8cd6d9b4a Merge "Add a Settings.Secure value to store extra battery saver schedule" into tm-qpr-dev am: 1dc27fa1f6 am: 00be659711
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19194690

Change-Id: I3928a59c7730582f3ece664274d670ff98e78080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 16:46:03 +00:00
TreeHugger Robot
00be659711 Merge "Add a Settings.Secure value to store extra battery saver schedule" into tm-qpr-dev am: 1dc27fa1f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19194690

Change-Id: I99927c9818b93b73f268bdc64fda1813e0d7b346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 16:26:58 +00:00
Wesley Wang
c7adaf6f0f Add a Settings.Secure value to store extra battery saver schedule
- To store extra battery saver schedule mode

Bug: 224899180
Bug: 236688783
Bug: 238841059
Test: Build pass and local access verify
Change-Id: I4a394de04fdb9020ce22377390b81bccfaec2090
2022-07-23 08:10:29 +00:00
Joshua McCloskey
2987c8b264 SideFPS UX updates
1. Added side fps auth delay on device entry/biometric
prompt to wait for power press.
2. Added tap to dismiss dialog for side fps enrollment.

Test: atest SideFpsEventHandlerTest
Bug: 233953696
Change-Id: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
Merged-In: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
2022-07-20 17:02:29 +00:00
Joshua Mccloskey
00c545be97 Merge "SideFPS UX updates" 2022-07-20 17:01:57 +00:00
Neil Fuller
66ba9ce8fa Merge "Add support for multiple NTP servers" 2022-07-20 10:18:13 +00:00
wesleycwwang
9121f848db Add dock charging state into stay awake feature (2/2)
- Make dump proto method support dock charging state
 - Add dock charging into proto file and validators

Bug: 233704731
Test: atest FrameworksServicesTests
Change-Id: I8208414cc40a12f783749d2c7a9f71be6efab8d9
2022-07-20 06:09:02 +00:00
Joshua McCloskey
60dedc99fe SideFPS UX updates
1. Added side fps auth delay on device entry/biometric
prompt to wait for power press.
2. Added tap to dismiss dialog for side fps enrollment.

Test: atest SideFpsEventHandlerTest
Bug: 233953696
Change-Id: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
2022-07-18 18:58:31 +00:00
Neil Fuller
0f2b48d1d6 Add support for multiple NTP servers
Add support for multiple NTP servers in NtpTrustedTime. The algorithm to
select the server is documented in comments in that class. Tests have
been updated accordingly.

This commit changes config.xml, removing (string) config_ntpServer and
replacing it with (string-array) config_ntpServers. It also modifies
command line and settings behavior.

Bug: 223365217
Test: atest frameworks/base/core/tests/coretests/src/android/util/NtpTrustedTimeTest.java
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/timedetector/
Test: atest cts/tests/tests/os/src/android/os/cts/SystemClockSntpTest.java
Test: adb shell settings put global ntp_server "ntp://time.google.com\|ntp://time.android.com"
Test: Inspection: adb shell dumpsys network_time_update_service
Test: Inspection: adb shell dumpsys time_detector
Change-Id: I5e19a4d82c9771448940b9f1db1689f21508667b
2022-07-18 14:50:02 +01:00
Prakriti Gupta
89085f606b Merge "Rename the WF Setting name to be more exact" 2022-07-15 17:20:37 +00:00
Wesley Wang
496afc58c9 Merge "Add dock charging state into stay awake feature (2/2)" 2022-07-15 02:55:27 +00:00