PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,450 Commits 1 Branch 0 Tags
d53409356d857bce73d2ff58a4a9ad7e3c5d9e8d
Commit Graph

35450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
TreeHugger Robot
915f0cea5b Merge "Remove Legal Information duplicate from Settings search" into oc-dev 2017-05-17 17:17:14 +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
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
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
Matthew Fritze
c6192251b2 Merge "Remove Special App Access duplicate from Setting search" into oc-dev 
am: d6aa9f3454

Change-Id: I0ae7c3ec171d1954a362c908ea73a8a5741f2554
 2017-05-16 22:44:49 +00:00
Charles He
7569bb1881 Properly remove fingerprints when removing device lock. 
When strong auth (PIN, password, or pattern) is removed from a user,
fingerprints enrolled for that user should also be removed. Then, if the
user has a work profile guarded by a unified work challenge, the work
profile's fingerprints should also be removed.

Previously, when removing the fingerprints of the current user,
ChooseLockGeneric checked the finger id of the onRemovalSucceeded() and
onRemovalError() callbacks, and assumed the removal had completed when
the id was 0. Only after this would it initiate the removal of work
profile fingerprints, if any.

However, the finger id is actually non-zero even for the user's last
fingerprint. This means the work profile fingerprints (under unified
challenge) were never removed. Another more visible symptom was that
when the user removed the device lock by choosing "None" or "Swipe" in
ChooseLockGeneric, the activity failed to exit, since finish() is called
only at the end of the removal flow which was not executed.

In this CL, we check the number of remaining fingerprints instead of
relying on the finger id, thus allowing the removal flow to complete and
the activity to finish().

Bug: 37938345
Test: manual, both with and without work profile
Test: make SettingsRoboTests
Change-Id: Ic04fd01177ad6d4a061023a4b6889af585f8f2b7
 2017-05-16 23:40:38 +01:00
Matthew Fritze
2e89758b01 Remove Legal Information duplicate from Settings search 
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f
 2017-05-16 15:39:03 -07:00
TreeHugger Robot
d6aa9f3454 Merge "Remove Special App Access duplicate from Setting search" into oc-dev 2017-05-16 22:37:22 +00:00
Steven Ng
17bb961066 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours 
am: 00266d056c  -s ours

Change-Id: Id573a18a0066575ef6aa53bc4b742949eb090461
 2017-05-16 21:39:54 +00:00
Steven Ng
00266d056c Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours 
am: 6496c3757b  -s ours

Change-Id: I2c58871339e8d2591afe38d58b2ec26b66f917b5
 2017-05-16 21:36:53 +00:00
Matthew Fritze
8b0ed39c11 Remove Network Restrictions duplicate from setting search 
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I6b1aef6102811a6ad25d2da43993441c6e56006c
 2017-05-16 14:35:19 -07:00
Steven Ng
25e02bc80c Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am: a2af16bb34 -s ours 
am: dde4d49385  -s ours

Change-Id: I641ab9c828bb088fa551c1d194e3676424ed1f3e
 2017-05-16 21:33:53 +00:00
Steven Ng
6496c3757b Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 
am: e05ef08a8e  -s ours

Change-Id: I19d1bacf055fb660d4ce829222662abfafb9c4a8
 2017-05-16 21:33:53 +00:00
Steven Ng
dde4d49385 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev 
am: a2af16bb34  -s ours

Change-Id: Ia126d3684bea6fdf19c58bc98324b019265af859
 2017-05-16 21:30:54 +00:00
Steven Ng
e05ef08a8e Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev 
am: c07f39c791

Change-Id: I00f92abcf2acd828ab8e81ed0053f7afd9f0d994
 2017-05-16 21:30:54 +00:00
Steven Ng
a2af16bb34 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev 2017-05-16 21:18:13 +00:00
Steven Ng
c07f39c791 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev 2017-05-16 21:17:59 +00:00
Bill Yi
d3dbc35ba7 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: e11a4d4e86  -s ours

Change-Id: I9e6981e64124043f872a0dd6b6679cd4b0021bf5
 2017-05-16 18:51:10 +00:00
TreeHugger Robot
e11a4d4e86 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-16 18:29:40 +00:00
Daniel Nishi
90c963b1fa Merge "Fix a bug where storage settings flickers." into oc-dev 
am: 1da7123930

Change-Id: I1cfe2b00a37e26d0e4f7c6806fadb601c5fdb617
 2017-05-16 17:07:34 +00:00
Daniel Nishi
1da7123930 Merge "Fix a bug where storage settings flickers." into oc-dev 2017-05-16 17:01:30 +00:00
Shinji Sogo
183aed6dd6 Merge "Show security info in saved network list" into oc-dev 
am: ecd1df1076

Change-Id: I068abbefd82c0447e474d6db6c38a56ea4703217
 2017-05-16 15:33:36 +00:00
TreeHugger Robot
ecd1df1076 Merge "Show security info in saved network list" into oc-dev 2017-05-16 15:25:53 +00:00
Bill Yi
dcdc60bab8 Import translations. DO NOT MERGE 
Change-Id: Ia166bd3b3e8acd794f43e415b15edbb579c54573
Auto-generated-cl: translation import
 2017-05-16 01:42:58 -07:00
Matthew Fritze
1f21e7f325 Merge "Replace dynamic summary text for SettingPref" into oc-dev 
am: 49b86b5c6a

Change-Id: Icb21526f03242d310824d20a21c82bd2f76893f2
 2017-05-16 00:12:07 +00:00
TreeHugger Robot
49b86b5c6a Merge "Replace dynamic summary text for SettingPref" into oc-dev 2017-05-15 23:46:18 +00:00
Steven Ng
14153fd25b 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-15 17:53:22 +00:00
Steven Ng
741f99ad22 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-15 17:52:44 +00:00
Bill Yi
e77c92c991 Import translations. DO NOT MERGE 
am: 3b2d98c714  -s ours

Change-Id: I425cc59dacedac1c97d92e700ad1e0e93bd0a089
 2017-05-13 06:51:12 +00:00
Bill Yi
3b2d98c714 Import translations. DO NOT MERGE 
Change-Id: I2906d6bf999dccdec191f285f73e04fe52f4c2a4
Auto-generated-cl: translation import
 2017-05-12 17:11:09 -07:00
Android Build Merger (Role)
4ccb4fd19e Merge "Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours am: 1c3120f196" into oc-dev-plus-aosp 2017-05-12 22:22:16 +00:00
Phil Weaver
be70654977 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 
am: 8f58e8b6e9  -s ours

Change-Id: Ib9fcc7305964fc16152ed86d16d42b48113b5c0d
 2017-05-12 22:21:56 +00:00
Phil Weaver
4f004a719c Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours 
am: 1c3120f196

Change-Id: I990f591be5bc0f596c910037e362ecee84c9ed9b
 2017-05-12 22:21:56 +00:00
Phil Weaver
1c3120f196 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c 
am: 611fda4a97  -s ours

Change-Id: I1e12d774e57528af8f263e36d64af95e9d5c23b0
 2017-05-12 22:19:53 +00:00
Phil Weaver
8f58e8b6e9 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c 
am: 611fda4a97

Change-Id: I5dfd4f444b4d13c139d8119f0e879fe71de20ad2
 2017-05-12 22:17:54 +00:00
Phil Weaver
611fda4a97 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 
am: 7f1bc85e4c

Change-Id: I3f92db015ad60b8e6257a71153a58a7883c1cac7
 2017-05-12 22:16:26 +00:00
Phil Weaver
7f1bc85e4c Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a 
am: 8247008239

Change-Id: Ieea167c11711139aff52c72c515b919240d7eb1a
 2017-05-12 22:14:22 +00:00
Phil Weaver
8247008239 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 
am: 9b8abd652a

Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa
 2017-05-12 22:11:56 +00:00
Phil Weaver
9b8abd652a Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 
am: adf8f8bc60

Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68
 2017-05-12 22:08:53 +00:00
Phil Weaver
adf8f8bc60 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 
am: 11b6279ed4

Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54
 2017-05-12 22:07:24 +00:00
Doris Ling
071aa6b88b Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev 
am: d821a32b8e

Change-Id: If0208dec8535fe72b14f73f42eb56ecfd7c9d2f7
 2017-05-12 22:06:32 +00:00