Commit Graph

38093 Commits

Author SHA1 Message Date
Govinda Wasserman
f04886df8b Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504 am: 26f121b673
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673

Change-Id: I848c23910f68343f9a3ff52acbc9a03a14882096
2021-08-20 17:47:33 +00:00
Govinda Wasserman
26f121b673 Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673

Change-Id: Ib92603ae0210aaa025f722d0d734b11e6030386c
2021-08-20 17:31:29 +00:00
Govinda Wasserman
3869aac6d3 Revert "Revert "Add sensitivity configuration to long press power dialog""
This reverts commit c4084d4141.

Reason for revert: Dependant change has now successfully been propagated to sc-v2-dev child graphs

Change-Id: I1f6126a423c72540d219b99e20b464b51ef65923
2021-08-20 17:06:40 +00:00
TreeHugger Robot
701b89a3b9 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf am: ef2c734413
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: Ibc897838a3d068d718df8be06e5ccd6b3925dbdd
2021-08-20 11:22:09 +00:00
TreeHugger Robot
ef2c734413 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: I9d2819fd3a9a043302295e8f1c6ba9d0e67c86cf
2021-08-20 11:11:08 +00:00
Sam Chang
c4084d4141 Revert "Add sensitivity configuration to long press power dialog"
This reverts commit de2f00df41.

Reason for revert: This CL will cause build break, b/197290948

Change-Id: Ibee2d4bc5e445e863585c291b4b2741bcb4b4c81
2021-08-20 06:46:33 +00:00
YUKAI HUNG
902ae0a655 Merge "[B&R] backup the getFullPowerWhitelist() for battery setting" into sc-v2-dev am: 5d59c685d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15611718

Change-Id: Ic2becc65d48bf577794578b2210152eccb59cb7c
2021-08-20 01:53:19 +00:00
YUKAI HUNG
5d59c685d7 Merge "[B&R] backup the getFullPowerWhitelist() for battery setting" into sc-v2-dev 2021-08-20 01:39:28 +00:00
ykhung
7cbc683d3e [B&R] backup the getFullPowerWhitelist() for battery setting
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy method name

Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I2d5c51b5b5788d703a233f5df719a298382feb98
2021-08-19 23:59:21 +00:00
Jernej Virag
4ff3404ebf Add sensitivity configuration to long press power dialog am: de2f00df41 am: a4034c602a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611

Change-Id: I4dce1c3176544f7df08c4ef9b3d28daddcd5a3ac
2021-08-19 15:28:52 +00:00
Jernej Virag
5d37f9b93d Add sensitivity configuration to long press power dialog am: de2f00df41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611

Change-Id: Iee7ce4a08a1a132e95eb9f4313b58c7fbe3eafd2
2021-08-19 15:16:26 +00:00
Jernej Virag
a4034c602a Add sensitivity configuration to long press power dialog am: de2f00df41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611

Change-Id: I0d94e4a5157dc18fdbe454fe0a3e24377dc78d53
2021-08-19 15:16:26 +00:00
Jernej Virag
de2f00df41 Add sensitivity configuration to long press power dialog
This gives the user the ability to configure the length of the long press power gesture. The configuration values are read from config.xml and can be customized per device.

Bug: 193792060
Test: Manual test on Pixel 6 and Pixel 4 hardware devices
Test: Unit tests with make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.gestures.*"
Change-Id: Ia6595c1337244b01e9c8b2ef04dd97a9a0f03de2
2021-08-18 19:41:10 -04:00
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
3fa1d36367 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: f4977c5e36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: I01256184429ddc1f337a5453b6a73ac6b441cfe4
2021-08-18 22:10:16 +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
f4977c5e36 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: Id383cf7ad45bed45a88fdc1c5583097357634248
2021-08-18 21:56:42 +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
48efcc5547 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: I59640625b9f47dd7493acb0d919b6680e1f25660
2021-08-18 18:12:52 +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
TreeHugger Robot
e39485b4b2 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: Ibe5966344f9c2ca2e13b40bdc6b69ebb0342f169
2021-08-18 18:12:23 +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
186ea2cd3b 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: I78ee6b2fb68ba44682e33cc6dbaaee6a64cba608
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