PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,140 Commits 1 Branch 0 Tags
2fb8f498ffe139b699ce48168da996e8ce24bf9c
Commit Graph

90140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tim peng
0143440a97 Merge "Not support group volume control" into sc-dev am: 49bf60df47 am: e74aa45c72 am: 151025ead2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137

Change-Id: Idd9ef07dedb3294e057ac0b7b89236047f71982b
 2021-06-23 00:37:34 +00:00
TreeHugger Robot
fca1922b83 Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b am: 88cbac1ac9 am: 518c3ce3c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686

Change-Id: Ia890b7dec707d748c000d61cbee8e6265e1e86ba
 2021-06-23 00:35:30 +00:00
Yi Jiang
5bfb7f9380 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 am: 708845caca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: Ic83a0e6f253ca22474addfd35b93d44f2245480f
 2021-06-23 00:18:46 +00:00
Matt Pietal
3947c8852c Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee am: 7922f41d88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: I9fa2597b8c9d4f6e5963288bb6f453e2d87d9d7a
 2021-06-23 00:18:38 +00:00
Arc Wang
5e7a242c8f Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 am: 9c30b55beb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: I5938a686365ce08d392565c6cddcc8401bbc384e
 2021-06-23 00:18:30 +00:00
TreeHugger Robot
e97da100dd Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15 am: e62bae21db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866

Change-Id: I2c7c2727dd932ee4d6d344810275993eb25c8e7a
 2021-06-23 00:18:01 +00:00
TreeHugger Robot
a623c1cd41 Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c am: 4b13bd3517 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681

Change-Id: Id37d1a8d8121c4be13c29dc666260e5124eeb2ed
 2021-06-23 00:15:28 +00:00
tim peng
151025ead2 Merge "Not support group volume control" into sc-dev am: 49bf60df47 am: e74aa45c72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137

Change-Id: I53e3cef45ace41cba2655fb31af106795b768e91
 2021-06-23 00:15:06 +00:00
TreeHugger Robot
518c3ce3c5 Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b am: 88cbac1ac9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686

Change-Id: Id3f08764b4f6b068869c614b20ef8087c25a8028
 2021-06-23 00:01:55 +00:00
Joshua Mccloskey
8362a5a6e1 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541 am: 894e209275 am: 8ac7902d78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: Ieba7f277b3ae9bc59e4745a6316a15ef3ec6c43c
 2021-06-22 23:52:01 +00:00
Joshua Mccloskey
8ac7902d78 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541 am: 894e209275 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: I1bb4004caadadaf54f33c365814e09ac6e13aaa3
 2021-06-22 23:34:12 +00:00
Yi Jiang
a75deaa01f Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 am: aee4809820 am: 63b698bfba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: I18a01bb8beea4b9a5b9fde81bb6656a3a8499163
 2021-06-22 17:28:51 +00:00
Matt Pietal
a12afb1269 Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee am: 4176d9fe01 am: 3ae1519d2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: I91e865ed708cad226a2378c9d36d65c1de283ca3
 2021-06-22 17:28:33 +00:00
Arc Wang
e30cd769f9 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 am: af29784f34 am: 8b070042fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: I6fc02733c5a558585078c0c1268f7b78e6d99bde
 2021-06-22 17:28:06 +00:00
Yi Jiang
63b698bfba Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 am: aee4809820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: I257e6a6ca5347e3ff47688d3189fb70bd2c5fbc7
 2021-06-22 17:06:50 +00:00
Yi Jiang
d27a09ed94 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 am: 966beb8255 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: I93c73f81aa0bfe736078571b08a57d5f14a42e56
 2021-06-22 17:06:22 +00:00
Yi Jiang
aee4809820 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: I22c6386b7c25d761b9d01a66788dd9d25643e21c
 2021-06-22 17:03:15 +00:00
Yi Jiang
966beb8255 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: Iddf713f724ba0effd20ad61331cf2af5bd5e1512
 2021-06-22 17:02:46 +00:00
Matt Pietal
3ae1519d2d Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee am: 4176d9fe01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: I6c7b56ccdc4d0dab978c11b584345f5575fc0a10
 2021-06-22 17:02:41 +00:00
Arc Wang
8b070042fc Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 am: af29784f34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: Iea9a08f0c74c6b423e46a1530ea3792d62791356
 2021-06-22 17:02:33 +00:00
Yi Jiang
708845caca Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: I88fd8f9e99d55f1e036a3d6c23a25b32cb30a1d3
 2021-06-22 17:02:13 +00:00
Matt Pietal
b854d06a08 Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee am: 0f45813339 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: I9a0717fcbe2fc1fd36b7c94a1bec3bcf4bae68f6
 2021-06-22 17:02:11 +00:00
Arc Wang
a40924f815 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 am: a3ca0a08d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: I5a053d3500b6789a995ed004ce3896ebc80f0fa1
 2021-06-22 17:01:47 +00:00
Yi Jiang
2de946e584 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev 2021-06-22 16:59:20 +00:00
Quang Luong
82934c57e7 Merge "Add WifiTrackerLib as separate dependency from SettingsLib" 2021-06-22 16:47:56 +00:00
Matt Pietal
4176d9fe01 Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: Ia6f7c24b2d93426366ac031ae766e78db678e5d9
 2021-06-22 16:45:50 +00:00
Arc Wang
af29784f34 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: I022679cace9a3edf7da86fca4711bbdc48ec0536
 2021-06-22 16:45:45 +00:00
Matt Pietal
0f45813339 Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: Iafd2896177f4b9ed67fd0bdb978c363e92fad7ed
 2021-06-22 16:44:55 +00:00
Matt Pietal
7922f41d88 Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: Ie0de066052b3492695841d3d1a77018d29631681
 2021-06-22 16:44:49 +00:00
Arc Wang
a3ca0a08d6 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: If349df73c14815307b9dbb38aef776ad58f8f386
 2021-06-22 16:44:47 +00:00
Arc Wang
9c30b55beb Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: Icd0ad261e41ef6ee563e43aff91edd26a7feb93d
 2021-06-22 16:44:43 +00:00
Matt Pietal
c07d6ba8ee Merge "Restore lockdown setting" into sc-dev 2021-06-22 16:41:44 +00:00
Arc Wang
b0e55afc95 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev 2021-06-22 16:25:13 +00:00
TreeHugger Robot
83969a4ffd Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15 am: e79286902d am: e41ce63337 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866

Change-Id: I27a7623c4bd1f531cd6820b46f6ae4a4ea8222b3
 2021-06-22 16:20:17 +00:00
TreeHugger Robot
a6a7882891 Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c am: 765dfcb761 am: 6b0b634636 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681

Change-Id: I3f1c190d8f38349b7a3463bf2993721c47f8f1c3
 2021-06-22 16:20:11 +00:00
tim peng
15aa65d63f Merge "Not support group volume control" into sc-dev am: 49bf60df47 am: a59db06434 am: bd4f684127 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137

Change-Id: I7f0c343eb11ebb2bc7395ae5a1703f72409a2db6
 2021-06-22 16:20:05 +00:00
TreeHugger Robot
6450b3a3d2 Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b am: 6d459fbfee am: 0b7755b40a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686

Change-Id: If8a2b79a48e8277d7bc18ebf6282f38d5e500ab6
 2021-06-22 16:19:45 +00:00
TreeHugger Robot
e41ce63337 Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15 am: e79286902d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866

Change-Id: I78abd84fb8819e406fadd5254ad79da7436391e9
 2021-06-22 16:15:44 +00:00
TreeHugger Robot
6b0b634636 Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c am: 765dfcb761 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681

Change-Id: I6e64f897d3d6fabfd6e322e59e285a1c9bc24543
 2021-06-22 16:15:38 +00:00
tim peng
bd4f684127 Merge "Not support group volume control" into sc-dev am: 49bf60df47 am: a59db06434 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137

Change-Id: If5be317d3357d1920603cd8c73b7ba5c9f32f54d
 2021-06-22 16:15:21 +00:00
TreeHugger Robot
0b7755b40a Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b am: 6d459fbfee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686

Change-Id: I12c2db968e0ffc8eb2246bea524b5d71da196a1a
 2021-06-22 16:05:01 +00:00
Joshua Mccloskey
fd04b52e27 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541 am: 6ca804bea3 am: a37c193300 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: I810f0896b2795998b2701922806da24734cd5c04
 2021-06-22 15:24:51 +00:00
Joshua Mccloskey
a37c193300 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541 am: 6ca804bea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: I815dfc484a96618d7c0b02c955c212cdbf36287b
 2021-06-22 15:12:34 +00:00
TreeHugger Robot
e79286902d Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866

Change-Id: If4c82a4c6d23e06d3b6351fee45109c3631a46ae
 2021-06-22 15:11:38 +00:00
TreeHugger Robot
765dfcb761 Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681

Change-Id: Ied5371f7d59f521720634ff53ed7d6c77ddabf5e
 2021-06-22 15:11:25 +00:00
tim peng
a59db06434 Merge "Not support group volume control" into sc-dev am: 49bf60df47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782137

Change-Id: I1381127514e3f091cec72b799e7e46364ad12352
 2021-06-22 15:08:57 +00:00
TreeHugger Robot
6d459fbfee Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686

Change-Id: I09003d3d58b1afe63d02155fc9e77d9f9e9a5a69
 2021-06-22 15:06:19 +00:00
Joshua Mccloskey
6ca804bea3 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: Iffa32888446502dbfbc5fe057a399611c77f8de4
 2021-06-22 14:57:14 +00:00
Matt Pietal
7cfd8e3cec Restore lockdown setting 
This was removed in error while adding wallet/controls options in
ag/14353975

Bug: 190800943
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Id73a584d7016cf1e649dcbceeba4e81aaa2370cc
 2021-06-22 10:56:20 -04:00
TreeHugger Robot
0007a99fa6 Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15 am: 8d72155a07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866

Change-Id: I813c2f7fe3918109719992302f908f6d17ae30d0
 2021-06-22 14:35:04 +00:00