Vania Januar
ec9b0a08ae
Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev am: 85de68a968
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24282035
Change-Id: I458987476dd269d8802b97e730bc9f999c6c864f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-14 17:14:26 +00:00
Anvesh Renikindi
4eb877cce7
Merge "Remove ExperimentalLifecycleComposeApi" into udc-qpr-dev-plus-aosp
2023-08-14 17:00:10 +00:00
Vania Januar
85de68a968
Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev
2023-08-14 16:47:40 +00:00
Wesley Wang
2545c9b3ae
Update detectSettingsAnomaly() return type (1/2) am: a277f78789
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24364875
Change-Id: I02e782eeee61d24e8990746a9993cfb06bfff802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 07:09:39 +00:00
Xinyi Mao
b0822b1720
Merge "Updated PowerAnomalyEvent Proto." into udc-qpr-dev am: 49c4ba78dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24329537
Change-Id: I2f3caff258868992d05598cf3c11f3f67d637b97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 07:09:22 +00:00
Xinyi Mao
0995018880
Merge "Improve battery tips cards." into udc-qpr-dev am: 3670fe1200
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24328442
Change-Id: Iab17204c66df80d1249898ad1141c81234405bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 07:09:18 +00:00
Kuan Wang
b01f52015d
Move static UsageStatsManager from DatabaseUtils to DataProcessor to am: 20ec9893d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24366174
Change-Id: I138d1f4732607dbca2a3578ab96ece91b280b01b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 07:07:11 +00:00
Wesley Wang
a277f78789
Update detectSettingsAnomaly() return type (1/2)
...
Bug: 291689623
Test: make SettingsRoboTests
Change-Id: I3611e746900569dca8cf308072c1344686d27f9a
2023-08-11 06:56:14 +00:00
Xinyi Mao
49c4ba78dc
Merge "Updated PowerAnomalyEvent Proto." into udc-qpr-dev
2023-08-11 06:34:05 +00:00
Xinyi Mao
3670fe1200
Merge "Improve battery tips cards." into udc-qpr-dev
2023-08-11 06:34:05 +00:00
Kuan Wang
20ec9893d2
Move static UsageStatsManager from DatabaseUtils to DataProcessor to
...
avoid reference from DataProcessor.
This is to fix the Accessibility tests hang issue.
Tested on main branch (https://android-build.googleplex.com/builds/abtd/run/L40400000962473343 ).
Test: make RunSettingsRoboTests
Bug: 293366011
Bug: 295026588
Bug: 295123907
Change-Id: I345e0c060165e4d06f98ada6b2e1ca3cbb4f911a
2023-08-11 06:30:59 +00:00
Eric Biggers
06bd7afe86
[automerger skipped] Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f
am: 71814b355c
am: fdf07d6c35
am: 99abeaeec1
-s ours
...
am skip reason: Merged-In I63f29c68f9a508fee0ee2f03f2cca33317fb8a32 with SHA-1 250f2727b0
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640
Change-Id: I6d584ef0482b2eea4ce0a4b2de16fa7bac3598dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 03:49:36 +00:00
Eric Biggers
e351ad55fc
Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d
am: a386c78678
am: ecca6508da
am: 47e19db82e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639
Change-Id: Id6930989f68707820aaeb9770acece73cbf744ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 03:49:31 +00:00
mxyyiyi
2148988cae
Improve battery tips cards.
...
- Updated Card UI
- Set thumb-up/down feedback preference to be GONE
- Add basic button action
[Screenshots] https://screenshot.googleplex.com/925MEzRyUCxZCi8
Test: manual
Change-Id: I356648d0fcec5dd1ea724297187ecafb5be55fd8
Merged-In: I356648d0fcec5dd1ea724297187ecafb5be55fd8
Bug: 291689623
2023-08-11 03:26:15 +00:00
Eric Biggers
99abeaeec1
Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f
am: 71814b355c
am: fdf07d6c35
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640
Change-Id: Ic208bc0ed3d9ff73a77fed35bc4cdc501f41e149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 02:22:36 +00:00
Eric Biggers
47e19db82e
Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d
am: a386c78678
am: ecca6508da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639
Change-Id: I5dbb93387c02bff45b4fc572f8e2a654837a4fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 02:22:33 +00:00
Eric Biggers
fdf07d6c35
Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f
am: 71814b355c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640
Change-Id: Ife2292b6bfa6c032701c1f44e4f40e969d83e929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 01:37:55 +00:00
Eric Biggers
ecca6508da
Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d
am: a386c78678
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639
Change-Id: I0ee235dd800b5bc7ab5e2ad2b4199500b69ad240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 01:37:49 +00:00
Eric Biggers
71814b355c
Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640
Change-Id: I3e589ba397243133a203ab3147bffea11f7158bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 00:38:25 +00:00
Eric Biggers
a386c78678
Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639
Change-Id: I8881a8521ca9e9748bb827b7d37a1dbabff1329e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 00:38:18 +00:00
Eric Biggers
137235a27f
Merge changes from topic "locksettings-aosp-first" into main
...
* changes:
ChooseLockPattern: remove redundant setting of visible pattern default
Stop calling LockPatternUtils.setVisiblePasswordEnabled()
2023-08-10 23:52:32 +00: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
Achim Thesmann
04a4e24d2f
Allow BAL from PrintServiceSettingsFragment am: 0ca2e98773
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24254634
Change-Id: Icd69269b8361b8aad72b9f3ca7b0c9432c679e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 20:21:18 +00:00
Achim Thesmann
0ca2e98773
Allow BAL from PrintServiceSettingsFragment
...
This fixes the info button on the printer in the printer list (the call
is from the system (uid=1000) and needs to allow BAL to start the
activity).
This only opts in sending a single pending intent to the previous (pre U) behavior which allows BAL. Therefore the risk of the change is minimal. This was reported by an external partner.
Bug: 277761614
Test: manual test & presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fdb87fe235887460081ed396cf6ab902f1971b5d )
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:afbc3a4929172e287ff3cbff2b5c9598a7c1e490 )
Merged-In: I35715e948b9166c42372b7d40a30a7102018a148
Change-Id: I35715e948b9166c42372b7d40a30a7102018a148
2023-08-10 15:52:51 +00:00
mxyyiyi
f4dc70ae37
Updated PowerAnomalyEvent Proto.
...
- Add repeated fields.
- Add unique id.
- Updated main_button action arguments.
Test: manual
Bug: 291689623
Change-Id: Id9fa88d6df0db50472732e4a50aa00a7a02db284
Merged-In: Id9fa88d6df0db50472732e4a50aa00a7a02db284
2023-08-10 18:19:46 +08:00
Graciela Putri
dcb788bded
Merge "[5/n] Add graphics to app aspect ratio options" into udc-qpr-dev am: 16f8639404
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24224466
Change-Id: I2608156bcda676d325136beda37c2d04863a31ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 08:13:31 +00:00
Graciela Putri
16f8639404
Merge "[5/n] Add graphics to app aspect ratio options" into udc-qpr-dev
2023-08-10 07:58:03 +00:00
SongFerng Wang
e527493354
Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev am: 9265db6557
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342218
Change-Id: I34d588990a5357a05f636a583361a608b4b28976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 05:43:51 +00:00
SongFerng Wang
9265db6557
Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev
2023-08-10 04:53:18 +00:00
Automerger Merge Worker
511c72a858
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours am: 38a0dbf56e
-s ours" into udc-qpr-dev-plus-aosp
2023-08-09 20:23:54 +00:00
Bill Yi
7cf9c48bae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours am: 38a0dbf56e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: Idaf3e9b4651f4a084b2b485fd4473b334a39fd9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:48 +00:00
Bill Yi
a504e18149
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours am: 9652e9c719
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I647a12e7e1346238ea666d6e1c573cb8490f1c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:39 +00:00
Bill Yi
a21b81f077
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours am: 6672750bc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I66fe9ee2e5c45c39272ca441336a9d3754a6704c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:25 +00:00
Bill Yi
38a0dbf56e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I35f0cefb18df5b77e3b80df34237c6aef76e2570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:54 +00:00
Bill Yi
9652e9c719
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I40d2c7cccabc1cf17c329ae6ab56c3a47ba0dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:53 +00:00
Bill Yi
6672750bc5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I1dff64c0aa9aba357dc489d82ffce984d7e861b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:02 +00:00
Bill Yi
6cb3c567da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: Id21824686a3e59ad6ee5bb57b5ff33f30b5e5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 18:56:54 +00:00
Bill Yi
5ba6d8c939
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I359371221dc01d908c2acae69c2665acdf6d060c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 18:52:49 +00:00
Bill Yi
735a75da63
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
BUG:291030186
Change-Id: Ibf93c473acbb5f6060ec039a8a1b5ec824d638f6
2023-08-09 17:24:49 +00:00
Vania Januar
2afb275e09
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72cb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342943
Change-Id: I1969dedbd9327fc6ab4dfa0715192b3f882a4e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 14:32:18 +00:00
Vania Januar
2d77f72cb6
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev
2023-08-09 13:50:06 +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
Vania Januar
558d9f8750
Add the USB device parameter to usb stylus feature preference provider.
...
Test: StylusUsbFirmwareControllerTest
Bug: 291922092
Change-Id: Ie43bceb807e18ff56d01f6e99316db6e2820383b
2023-08-09 11:06:23 +00:00
Eric Biggers
6cb2d5a795
ChooseLockPattern: remove redundant setting of visible pattern default
...
Remove the code that set LOCK_PATTERN_VISIBLE to true the first time a
pattern was set, since LOCK_PATTERN_VISIBLE now defaults to true when
unset (ag/22912136). The explicit defaulting to true was only needed
before because the low-level default value was wrong.
Bug: 270013005
Test: Set a pattern. Verified that Keyguard uses visible pattern.
Disabled the "Make pattern visible" option in Settings. Verified
that Keyguard doesn't use visible pattern.
Change-Id: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
Merged-In: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
(cherry picked from commit 6c3de30086
)
2023-08-09 04:03:18 +00:00
Eric Biggers
08e6612a3d
Stop calling LockPatternUtils.setVisiblePasswordEnabled()
...
Since the removal of support for Full Disk Encryption (FDE) in favor of
File Based Encryption (FBE), this method has been a no-op.
Bug: 208476087
Test: atest ShowPasswordPreferenceControllerTest. Note,
isAvailable_whenNotVisible_isFalse fails both before and after.
Change-Id: Ifb8fc93757366240cf37e4b9a600c2034302919e
Merged-In: Ifb8fc93757366240cf37e4b9a600c2034302919e
(cherry picked from commit bcee8ce1af
)
2023-08-09 04:02:54 +00:00
Treehugger Robot
b5195183cc
Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353
Change-Id: I00faa95548e4fba8d1a0618b0064080a609b6f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 02:46:35 +00:00
Treehugger Robot
611e43fe05
Merge "Fix crash after confirmLock" into udc-qpr-dev
2023-08-09 02:10:49 +00:00
Eric Biggers
af0ddcf8e6
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours am: 80ef1e0ff5
-s ours am: 7f97ac5ea7
-s ours am: 4643015447
-s ours am: f050fc11ca
-s ours am: a78f35b23d
-s ours am: 1679e7f685
-s ours am: 4471257a0b
-s ours am: 6cc1240b9d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I06f9cd874393b2bb275db1f533bbcfa7fd86f643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:09:02 +00:00
Eric Biggers
6a369e6269
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours am: d1a31c8619
-s ours am: bf4f533ea6
-s ours am: d890d1b428
-s ours am: 8b995bbc72
-s ours am: 6ad8bea7c9
-s ours am: 618272911a
-s ours am: 179b563079
-s ours am: ea68785152
-s ours am: 95ee7cd219
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Id30304f21a54310427ec15bb64d08a17b0eb597d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:06:37 +00:00
Eric Biggers
2459ed07d1
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours am: 80ef1e0ff5
-s ours am: 7f97ac5ea7
-s ours am: 4643015447
-s ours am: f050fc11ca
-s ours am: a78f35b23d
-s ours am: 1679e7f685
-s ours am: 02bbe6b4a5
-s ours am: de352f9e1e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I33890fbb26e154621c7a51d6b92d95662a9de66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:05:05 +00:00