PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,180 Commits 1 Branch 0 Tags
1bceb954ed6871d27e9c00f8d9ea7cc83a61353a
Commit Graph

36180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Youhan Wang
1bceb954ed Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev am: 350ba4a4c3 
am: c6b1845d0f

Change-Id: I3bee5b3a1e90a7f8766b875045a54a9945264226
 2017-05-17 23:46:20 +00:00
Youhan Wang
c6b1845d0f Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev 
am: 350ba4a4c3

Change-Id: Ia508085e2fe2dd2061d772b0caf976d039aaa213
 2017-05-17 23:42:49 +00:00
Youhan Wang
350ba4a4c3 Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev 2017-05-17 23:38:08 +00:00
Steven Ng
9a0299cd52 Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp am: 3b76c25cee -s ours 
am: 268be8edde

Change-Id: Idd556e4ec777eb2ec4c52c6df28f16a64435ca9c
 2017-05-17 22:54:57 +00:00
Steven Ng
268be8edde Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp 
am: 3b76c25cee  -s ours

Change-Id: I6b9f260b8494ced24cd758207981d60c9a5ca97e
 2017-05-17 22:49:14 +00:00
Steven Ng
3b76c25cee Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp 2017-05-17 22:43:11 +00:00
Steven Ng
3c03b45a16 DO NOT MERGE Fix build failure due to missing guava target 
Test: 1) build sailfish-userdebug successfully
      2) m SettingsTests -j32 built successfully

Bug: 33059280
Change-Id: If1c281888e4581b5eb3b8842892464aebd04b827
 2017-05-17 22:40:33 +00:00
Lei Yu
868ecae66d Merge "Add AnomalyDetectionPolicy" 2017-05-17 21:10:30 +00:00
Steven Ng
70dab70c30 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours am: 9eeb954d39 -s ours 
am: be7621e1d7  -s ours

Change-Id: I8232b0ee829d7c46dacd066a746fb8055a5e3818
 2017-05-17 21:07:45 +00:00
Steven Ng
c8df41ec8f Fix phishing attack in ChooseLockGeneric am: 56870f438c -s ours 
am: b0ad380d0c  -s ours

Change-Id: I466c5cd87ac090793e44f1270a2bb1f6e7a4d611
 2017-05-17 21:07:09 +00:00
Steven Ng
be7621e1d7 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours 
am: 9eeb954d39  -s ours

Change-Id: I10aad8dbfe4b42a887b2166608456595640e0feb
 2017-05-17 21:05:09 +00:00
Steven Ng
b0ad380d0c Fix phishing attack in ChooseLockGeneric 
am: 56870f438c  -s ours

Change-Id: I3f71fa7a65f732de8816b43f02df3cf414e8408b
 2017-05-17 21:04:40 +00:00
Steven Ng
9eeb954d39 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours 
am: 6496c3757b  -s ours

Change-Id: I1032e8ad372d0f5cff35e1a1f018ceecedf9bff2
 2017-05-17 21:01:46 +00:00
Antony Sargent
3033c1a2cf Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am: c439202da9 
am: 3afb6616c6

Change-Id: I37280e12b32047ddef316be763f69b5ff648b557
 2017-05-17 19:41:16 +00:00
Antony Sargent
3afb6616c6 Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev 
am: c439202da9

Change-Id: I2e0eed6c7332a9968b020c69dcc7f5507b355f6e
 2017-05-17 19:12:43 +00:00
Matthew Fritze
c838e959f7 Merge "Remove duplicates from sound settings" into oc-dev am: 3abeba07d3 
am: a939959838

Change-Id: I0260cf2a7dd9d54b700387d0d82f58a7c6a3263c
 2017-05-17 19:07:45 +00:00
Matthew Fritze
8cd0562bd6 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce 
am: af054e63e0

Change-Id: I35667061a61fd66e8ab8acafccffb53f00f15149
 2017-05-17 19:06:59 +00:00
TreeHugger Robot
c439202da9 Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev 2017-05-17 18:59:54 +00:00
Matthew Fritze
a939959838 Merge "Remove duplicates from sound settings" into oc-dev 
am: 3abeba07d3

Change-Id: Ief8e333082ef6d8064a51fc54b052e1476880a55
 2017-05-17 18:51:14 +00:00
Matthew Fritze
af054e63e0 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev 
am: 4bd0f411ce

Change-Id: I680a407f9955e74b66e5c87af6b8a8d4335c530d
 2017-05-17 18:50:28 +00:00
TreeHugger Robot
3abeba07d3 Merge "Remove duplicates from sound settings" into oc-dev 2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev 2017-05-17 18:28:35 +00:00
Kenny Guy
31457d5a2a Merge "Disable managed profile version of shortcut picker." into oc-dev am: c760135f14 
am: 020dd7b169

Change-Id: I8acfa1dd9e19cf7ad31cadae047cf44f6d88dcc8
 2017-05-17 17:53:40 +00:00
Matthew Fritze
256e9e208e Merge "Remove Network Restrictions duplicate from setting search" into oc-dev am: 09dbc8043f 
am: d53409356d

Change-Id: Ia40375afa74f82a46c01aef99b95d6074fbc5324
 2017-05-17 17:53:08 +00:00
Kenny Guy
020dd7b169 Merge "Disable managed profile version of shortcut picker." into oc-dev 
am: c760135f14

Change-Id: I9df7203ba655e1f483464c0b5cbec14800919ae1
 2017-05-17 17:43:44 +00:00
TreeHugger Robot
c760135f14 Merge "Disable managed profile version of shortcut picker." into oc-dev 2017-05-17 17:38:30 +00:00
Matthew Fritze
d53409356d Merge "Remove Network Restrictions duplicate from setting search" into oc-dev 
am: 09dbc8043f

Change-Id: Ia172fc4c93b2259ed9a51248159784a89fbdf638
 2017-05-17 17:37:51 +00:00
Steven Ng
56870f438c Fix phishing attack in ChooseLockGeneric 
Cherry-pick of 436256c36d

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
 2017-05-17 18:37:01 +01:00
Matthew Fritze
f81f1024c3 Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b 
am: 70db53a8d5

Change-Id: I03de10d23f3d9a74ee08fdb6a711400e3e0468cf
 2017-05-17 17:31:08 +00:00
TreeHugger Robot
09dbc8043f Merge "Remove Network Restrictions duplicate from setting search" into oc-dev 2017-05-17 17:27:57 +00:00
Matthew Fritze
70db53a8d5 Merge "Remove Legal Information duplicate from Settings search" into oc-dev 
am: 915f0cea5b

Change-Id: I508afeb3b832ffc444fa5dafe4836fc0ae202eb0
 2017-05-17 17:26:07 +00:00
Matthew Fritze
dffaa57cb1 Merge "Remove default app duplicates in search" into oc-dev am: 0c55014b88 
am: 79cfaa7b91

Change-Id: I1beb3569054d6acbcd9f22d112031de51b862dc9
 2017-05-17 17:17:37 +00:00
TreeHugger Robot
915f0cea5b Merge "Remove Legal Information duplicate from Settings search" into oc-dev 2017-05-17 17:17:14 +00:00
Matthew Fritze
4704356bfb Merge "Remove Wallpaper duplicate from setting search" into oc-dev am: 564b965ccc 
am: 5a151d23ab

Change-Id: If022852ca522b4d3f2fc8a01a9e96b966ab98cfa
 2017-05-17 17:16:47 +00:00
Matthew Fritze
79cfaa7b91 Merge "Remove default app duplicates in search" into oc-dev 
am: 0c55014b88

Change-Id: I62f5fbd444836aa73b6ff801bad944c9a8fddd4b
 2017-05-17 17:14:24 +00:00
Matthew Fritze
5a151d23ab Merge "Remove Wallpaper duplicate from setting search" into oc-dev 
am: 564b965ccc

Change-Id: I955360c67d040a7c05685e8928e54dc6ac1109b6
 2017-05-17 17:13:46 +00:00
TreeHugger Robot
0c55014b88 Merge "Remove default app duplicates in search" into oc-dev 2017-05-17 17:08:12 +00:00
TreeHugger Robot
564b965ccc Merge "Remove Wallpaper duplicate from setting search" into oc-dev 2017-05-17 17:06:18 +00:00
Kenny Guy
4761da3b73 Disable managed profile version of shortcut picker. 
Don't show managed profile version of shortcut
picker as it lunaches same activities as personal
one.

Test: manual - check badged shortcut isn't present in launcher.
Bug: 38333213
Change-Id: Iade6595255524a8dbf223a70a6c8312087258c23
 2017-05-17 16:44:01 +01:00
Charles He
80c3a16e92 Merge "Properly remove fingerprints when removing device lock." into oc-dev am: 98229bdf32 
am: af36129ae9

Change-Id: Iffc4f16ac3301bc0fbe9b4d8a1c88b3e71ce2373
 2017-05-17 13:12:00 +00:00
Charles He
af36129ae9 Merge "Properly remove fingerprints when removing device lock." into oc-dev 
am: 98229bdf32

Change-Id: I98ed8a43e4644d709d9cb9ddeb799672a8fb6bc6
 2017-05-17 13:04:40 +00:00
Charles He
98229bdf32 Merge "Properly remove fingerprints when removing device lock." into oc-dev 2017-05-17 12:58:21 +00:00
Matthew Fritze
2d6c7df80b Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev am: bcb2565e05 
am: f8b8ecebea

Change-Id: I4ae1d981c928e1b61d555d129723b7dabafd439c
 2017-05-17 04:48:50 +00:00
Matthew Fritze
f8b8ecebea Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev 
am: bcb2565e05

Change-Id: I8a89b5a7676a9fb9961e4275c417a425baa5938e
 2017-05-17 04:46:15 +00:00
TreeHugger Robot
bcb2565e05 Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev 2017-05-17 04:34:02 +00:00
Matthew Fritze
8061aaef62 Revert "Replace dynamic summary text for SettingPref" 
This reverts commit 03dfa50996.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100
 2017-05-17 02:56:28 +00:00
TreeHugger Robot
b900846e8e Merge "Do not close cursor in onLoadFinished" 2017-05-17 01:24:34 +00:00
Youhan Wang
c426fe6c68 TelephonyMonitor: Replace boolean decision with multiple status. 
Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40

Use enable, disable, user_enable, user_disable four statuses to
replace the old boolean value,

Bug:36704500
Change-Id: I5d3fd36aecaf36bb6969a6f6354c85bb162a0293
 2017-05-17 01:11:53 +00:00
Matthew Fritze
06976317cb Remove duplicates from sound settings 
Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785
 2017-05-16 15:58:54 -07:00
Matthew Fritze
61c80c2ab6 Merge "Remove Special App Access duplicate from Setting search" into oc-dev am: d6aa9f3454 
am: c6192251b2

Change-Id: Ia442b29148675a291aca2b317c398bf285b3a2eb
 2017-05-16 22:53:37 +00:00