Commit Graph

38075 Commits

Author SHA1 Message Date
TreeHugger Robot
4f014f690c Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: 27f9d9ce04 am: 9def67d894
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: Ie39d75d5f53fdcac88b8578af0cafd0ec4a6dafa
2021-08-18 22:18:44 +00:00
TreeHugger Robot
9def67d894 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: 27f9d9ce04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: Ic349cb0e82e5c6a596ab232d3b23e333b1723241
2021-08-18 22:09:41 +00:00
TreeHugger Robot
27f9d9ce04 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: I8d7ecb3c01a7480669e39e0f371030a9ffa905f7
2021-08-18 21:55:56 +00:00
TreeHugger Robot
6bf17de139 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev 2021-08-18 21:38:32 +00:00
Neha Jain
0b96b6d13b Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 92171172ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: Ic16ea6b43b4ee5cfc2a7d1f1e9a3287d62ab491c
2021-08-18 18:31:24 +00:00
TreeHugger Robot
8fc64966fa Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d am: a513ecb2da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: I7abe37232b3d60328d1c67f36b61057ea2399b76
2021-08-18 18:30:59 +00:00
Neha Jain
92171172ec Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I575d9f32e028249f49360b37dacfab9df9404e7f
2021-08-18 18:12:40 +00:00
TreeHugger Robot
a513ecb2da Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: Ia854e365a828137bcc3f6d112695ed2b1c051313
2021-08-18 18:12:32 +00:00
Neha Jain
bc0cf0d87f Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I04fdc7c76285de7ad43b83846de10a377eb4f151
2021-08-18 18:12:08 +00:00
Neha Jain
59fb9ccac7 Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: If854986d16aeca997c309da10b5153600131389e
2021-08-18 18:11:06 +00:00
Neha Jain
abd0f6a5f6 Merge "Remove CDM entries in Connected Device." into sc-dev 2021-08-18 18:01:00 +00:00
TreeHugger Robot
190603f53d Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev 2021-08-18 17:56:51 +00:00
Daniel Sandler
509670cb0d LPP will now always launch either GlobalActions or the Assistant.
Previously, on devices that default to launching Assistant
on long-press power, toggling this checkbox in Settings
would switch between that default (launching Assistant) and
a no-op. Those devices now toggle between Assistant and
GlobalActions (the power menu), just like devices that have
the old default behavior of LPP launching GlobalActions.

Change-Id: Id36031e70825da195f9c30ce05b3ae3d5e49b5fb
Test: make RunSettingsRoboTests \
	ROBOTEST_FILTER=LongPressPowerButtonPreferenceControllerTest
Bug: 192946325
2021-08-18 11:06:54 -04:00
Calvin Pan
cad9603b2e Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: f687c1ea61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I9fef74a954ee2ab03037e4c3abaa2539749f8d9e
2021-08-18 07:05:33 +00:00
Calvin Pan
f687c1ea61 Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I27ae050157e9143c0472d4e18ad7c29dab42d8c2
2021-08-18 06:56:25 +00:00
Calvin Pan
abb8a6abdc Merge "Remove unnecessary condition" into sc-qpr1-dev 2021-08-18 06:43:59 +00:00
Jordan Jozwiak
8df6b505af Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev am: 5da0ca8a14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15547175

Change-Id: Ie4805efe824392507eff9ef70c1ee8281491f422
2021-08-17 21:51:12 +00:00
Jordan Jozwiak
5da0ca8a14 Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev 2021-08-17 21:40:30 +00:00
YUKAI HUNG
c4234a86a8 Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411

Change-Id: I547b749bf8186e08ef33f7eb7635842b4895d1c8
2021-08-17 17:27:51 +00:00
YUKAI HUNG
0a308d056b Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev 2021-08-17 17:10:26 +00:00
Treehugger Robot
bba477b3ed Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee am: 5f69669adb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: Ifc7949ccb9eb3e9b15eaa3fea78d2a90c0024a6e
2021-08-17 04:53:01 +00:00
Treehugger Robot
5f69669adb Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: Ibf4c5605ece3d2f49602b60602c523d1e7c4877b
2021-08-17 04:41:07 +00:00
Treehugger Robot
78ed3bb6ee Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: I3d44a009fc1fb653a074c0b5075b673dcbee82d8
2021-08-17 04:28:48 +00:00
ykhung
518d6df4f4 [Security] resolve RequestIgnoreBatteryOptimizations info disclosure
after discussed with kdeus@ we will remove the setResult() from the
dialog action to avoid the caller apps can distinguish the users
interaction behavior, and declared REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
in other applications.

Bug: 195963373
Test: make SettingsRoboTests
Change-Id: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
2021-08-17 12:06:59 +08:00
PETER LIANG
976b30afe3 Merge changes I57306532,I1fba7ee1 into sc-v2-dev am: 4cddfd2b00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15478953

Change-Id: I6eee350feacecdb9d4bc83f6e297ac4c374c89e5
2021-08-17 03:12:08 +00:00
PETER LIANG
4cddfd2b00 Merge changes I57306532,I1fba7ee1 into sc-v2-dev
* changes:
  Update the instruction images in Accessibility tutorial dialog.
  Update the instruction images in Accessibility edit shortcut dialog.
2021-08-17 03:00:28 +00:00
YUKAI HUNG
1b92bfe010 Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev am: 7053c5e265
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552649

Change-Id: I97ee066342d3c66bfa279eab6e238942f64eee3f
2021-08-17 02:54:11 +00:00
YUKAI HUNG
7053c5e265 Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev 2021-08-17 02:37:37 +00:00
Curtis Belmonte
4f1672ce7b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I8f77b33b4bcba08b8a25965cf165db290aaeca11
2021-08-17 01:15:50 +00:00
Curtis Belmonte
bf54fec03a Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69 am: 474fba01f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Icc46cedb2fcd2e7a7bc471a029f2e7c832cecbdc
2021-08-17 01:15:04 +00:00
Curtis Belmonte
36a42b630b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ia1824f9bbb81d95e928f32f39f088a4a6aeaef9e
2021-08-17 01:02:08 +00:00
Curtis Belmonte
474fba01f1 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ibb2a4c9f98a1c6f302288252201d12f28de4a1e1
2021-08-17 01:01:47 +00:00
Curtis Belmonte
7fb2316a21 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev 2021-08-17 00:47:58 +00:00
Joe Bolinger
6e1ecbd617 Update OWNERS.
Test: N/A
Change-Id: I6646a2b7dda95f458b95c0fed331b1cb213fcae8
2021-08-16 17:12:53 -07:00
Curtis Belmonte
dbef2415d3 [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ief92774377376ea11b4e099f7c0cf5764cbf7f31
2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446 Remove/replace old fingerprint icon in SUW/Settings
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.

Test: Manual

Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
Jordan Jozwiak
e6835713b6 Use refactored RecentAppOpsAccess
Use the new class in place of the old one.

Bug: 182202223
Test: atest RecentLocationAccessPreferenceControllerTest
Change-Id: If0222e79bf8ba2ebe2b1b0a8c043ce39f5a45596
2021-08-16 13:08:47 -07:00
Peter_Liang
192dfdec7f Update the instruction images in Accessibility tutorial dialog.
1. Update the material next style.
2. Support for Lottie image.

Bug: 195094388
Test: manual test
Change-Id: I57306532b10e91c927bdc1ef5e115f41bc7a939b
2021-08-16 16:20:01 +08:00
Peter_Liang
c2a04e3820 Update the instruction images in Accessibility edit shortcut dialog.
1. Update the material next style.
2. Support for Lottie image.

Bug: 195094388
Test: manual test
Change-Id: I1fba7ee1d18b53f4c917319d2c0a4a304de0ae43
2021-08-16 15:36:32 +08:00
TreeHugger Robot
85e6aba27f Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f am: f680c9b0b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: I22f3bf1a65273f70a59cb59018bc9f44d04552b2
2021-08-14 07:37:41 +00:00
TreeHugger Robot
e9f836a004 Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: Ic64df3fc905575608ec561ba9e8d2efb93fe0b7c
2021-08-14 07:26:54 +00:00
TreeHugger Robot
f680c9b0b5 Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
2021-08-14 07:26:53 +00:00
Alfred Lin
7f8e775754 Prototyping : Demo Image on color setting
Implement prototyping of demo image on color setting

Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
2021-08-13 15:08:58 +00:00
ykhung
96e9685687 Add a skeleton to support battery configucation backup/restore
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I559eed40b05b73e7af5e091115afb11c4ba51068
2021-08-13 20:25:09 +08:00
Tsung-Mao Fang
74b1a46cb1 Move Automatic System Updates from Developer Options to System
- Move the preference to the system xml file.
- DisableAutomaticUpdatesPreferenceController should not
inherit from the developer preference controller now since it's not used
in developer page anymore. Instead, just use toggle preference
controller for changing the state.
- Rewrite the test cases based on new controller.

Test: The ui works well and search can navigate to correct path.
Fix: 196001125
Change-Id: Iaea3e11d9cdbfa073ebd41bc3c84356d564c7e71
2021-08-13 08:11:22 +00:00
TreeHugger Robot
fb60c7664f Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: 597ca951a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I5c096d2b447c8012dc7b7cd27598585651123e60
2021-08-13 05:38:45 +00:00
TreeHugger Robot
f1772f686b Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Id581e29e3b2ec42a93846d1878caf9bee334fa3b
2021-08-13 04:27:15 +00:00
TreeHugger Robot
597ca951a9 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I31d94c633afda15f05d660e6854c2b6c552a6d7a
2021-08-13 04:27:14 +00:00
TreeHugger Robot
1741d5d12c Merge "Handle spanned conversation labels" into sc-qpr1-dev 2021-08-13 04:11:04 +00:00
Joe Bolinger
ba21ddcc35 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 74efeebf5c am: 0c8e25d2f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I2628d6122ec21c0ce65b22d6e880adde90dd0dfa
2021-08-13 02:56:11 +00:00