Steven Ng
470dc125c8
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am: a2af16bb34
-s ours am: dde4d49385
-s ours
...
am: 25e02bc80c
-s ours
Change-Id: I877a362643f92257fe2d741e4a2c9db3606f15d0
2017-05-16 21:43:13 +00: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
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
Christine Franks
6962c1841d
Merge "Fix switch widget in night display preference"
2017-05-16 21:23:22 +00:00
TreeHugger Robot
b7b258e539
Merge "Add title to SeekbarPreference content description."
2017-05-16 21:20:48 +00:00
Steven Ng
a2af16bb34
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
2017-05-16 21:18:13 +00:00
Fan Zhang
667d427967
Revert "Update strings in special app access and dev options"
...
This reverts commit 9834bd82da
.
Fix: 38347840
Test: make RunSettingsRoboTests
Change-Id: Ia366db7d9779c14a1b8cbe86e509bc54c9eee658
2017-05-16 13:54:28 -07:00
Fan Zhang
cbfe1eb881
Add title to SeekbarPreference content description.
...
Adding a title to contentDesciption of the seekbar.
The title is helpful to indicate which seekbar user is changing when
talkback is enabled.
Also move SeekBarPreference from root package to widget packge.
Change-Id: I793f41c4902e350b6bc6d62761362779cc3722a9
Fix: 35421942
Test: make RunSettingsRoboTests
2017-05-16 12:35:45 -07:00
Bill Yi
a6848b5c0a
Merge "Import translations. DO NOT MERGE" into oc-dev am: e11a4d4e86
-s ours
...
am: d3dbc35ba7
-s ours
Change-Id: I63050052671d3ac376028a04539811c164508c26
2017-05-16 19:34:36 +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
Saige McVea
3b1bf3b96d
Merge "Update a11y icon in Setting."
2017-05-16 18:32:31 +00:00
TreeHugger Robot
e11a4d4e86
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-16 18:29:40 +00:00
TreeHugger Robot
1e3dee996f
Merge "Import translations. DO NOT MERGE"
2017-05-16 18:29:32 +00:00
Daniel Nishi
fe32e957c9
Merge "Fix a bug where storage settings flickers." into oc-dev am: 1da7123930
...
am: 90c963b1fa
Change-Id: I46fa3abdf3843b442b5ff484e74ae91d41eb68bd
2017-05-16 17:14:02 +00:00
Christine Franks
ce6b462948
Fix switch widget in night display preference
...
Bug: 38314992
Test: manual - visual inspection
Change-Id: I010d6be0eb53fffa07ffdbb771125f5aeff20727
2017-05-16 10:12:23 -07: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
b8548f762c
Merge "Show security info in saved network list" into oc-dev am: ecd1df1076
...
am: 183aed6dd6
Change-Id: Ib479ee98d5c6500954e5dede317f46c19bc2aca6
2017-05-16 15:39:57 +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
Bill Yi
90123fbe8e
Import translations. DO NOT MERGE
...
Change-Id: I52f32704074371cac217c05bbb734c2bb8a601e9
Auto-generated-cl: translation import
2017-05-16 01:30:19 -07:00
Maurice Lam
470503e984
Merge "Make lock pattern more usable on small screens"
2017-05-16 02:08:54 +00:00
Matthew Fritze
5a44fe4dad
Merge "Replace dynamic summary text for SettingPref" into oc-dev am: 49b86b5c6a
...
am: 1f21e7f325
Change-Id: Ie231837dc4ae0f4f94f326f67c06dfc2eb79ce4e
2017-05-16 01:56:55 +00:00
TreeHugger Robot
85c6d94763
Merge "Fix vpn config dialog text alignment in RTL locales"
2017-05-16 00:43:11 +00:00
Saige McVea
677603e434
Update a11y icon in Setting.
...
The accessibility icon should have curved arms. This change updates
the drawable from straight arms (old) to curved arms (current).
Test: manual
Bug: 37549672
Change-Id: I9848200a402bfb6056f6cf0b20db2bc48b92430c
2017-05-16 00:39:00 +00:00
Maurice Lam
4853cce971
Make lock pattern more usable on small screens
...
- Remove the icon on screens smaller than sw400dp
- Make sure all margins and spacing are removed before shrinking
content
- Shrink the pattern view to avoid cutting off the text at the top
Test: Manual
Bug: 38269249
Change-Id: I5d7bf956929f52952a588962febf3dcf43286b76
2017-05-15 17:24:34 -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
TreeHugger Robot
5362bb2222
Merge "Code inspector test clean up."
2017-05-15 23:33:05 +00:00
TreeHugger Robot
96d05ef43a
Merge "Update strings in special app access and dev options"
2017-05-15 22:23:02 +00:00
Fan Zhang
1eec4084ed
Fix vpn config dialog text alignment in RTL locales
...
Change-Id: Ifc5a14285a337b2b168a4c6770d92f3da328b9d0
Fix: 38142136
Test: visual
2017-05-15 15:19:09 -07:00
Fan Zhang
51449262db
Code inspector test clean up.
...
Make sure code inspector tests fail if the grandfather list contains
things that no longer exists in code
Change-Id: Ib114909959040275a9d9aebd81ecbe3d96d3af03
Test: make RunSettingsRoboTests -j40
Fix: 37686032
2017-05-15 14:56:18 -07:00
Pankaj Kanwar
9e8a182c31
Merge "Remove Sleep options from Advanced wifi."
2017-05-15 20:23:18 +00:00
Fan Zhang
9834bd82da
Update strings in special app access and dev options
...
- Change all yes/no or on/off strings in special app access to
Allowed/Not allowed
- Remove some dead code in related files
- Add a toast string in DevelopmentSettingsDisabledActivity to prompt
user enable dev options before use.
- Add search in SpecialAccessSettings
Change-Id: I8b2535e037a86e76bdbcd3fb6e1cf2e0347bedbf
Fix: 38290299
Fix: 37469224
Test: make RunSettingsRoboTests
2017-05-15 13:22:51 -07:00
TreeHugger Robot
f952789285
Merge "Add pairing preference"
2017-05-15 20:12:45 +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
jackqdyulei
1b853c5597
Add pairing preference
...
This preference lives in paired category. When clicked, it will
go to the pairing page.
Bug: 35877041
Test: RunSettingsRoboTests
Change-Id: I64706c49c8d303a494d4c1827e1f86b59effd54c
2017-05-15 10:46:28 -07:00
Fan Zhang
8e0754e84c
Correctly report whether the current app is default home.
...
Change-Id: I79c374228e82c91667d7b5a0dcc19fa1216e57c4
Fix: 38065524
Test: make RunSettingsRoboTests
2017-05-15 10:17:37 -07:00
pkanwar
2fca2ebddf
Remove Sleep options from Advanced wifi.
...
Sleep options are not relevant any more. This CL removes them from the
settings code.
Bug: 35994481
Test: make RunSettingsRoboTests
Change-Id: Ibd0b33ded3aa2da3df73c519611c915deed6310f
2017-05-15 16:39:48 +00:00
Bill Yi
5230ffe3a5
Import translations. DO NOT MERGE am: 3b2d98c714
-s ours
...
am: e77c92c991
-s ours
Change-Id: Ie39f8fff5d0c92826a21958abde00034b9d481db
2017-05-13 06:57: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
TreeHugger Robot
d1e4ece2c3
Merge "Import translations. DO NOT MERGE"
2017-05-13 06:21:14 +00:00
Maurice Lam
9f1a44599b
Merge "Clean up choose lock intent creation"
2017-05-13 00:43:51 +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
Bill Yi
9490c36598
Import translations. DO NOT MERGE
...
Change-Id: Ie0fc2f56d626dffbb2b7ca902d8c327f5a9f544c
Auto-generated-cl: translation import
2017-05-12 17:05:00 -07:00
Phil Weaver
eb1a7f924f
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
...
am: 4ccb4fd19e
Change-Id: Icd1ebbacea32b3936fca27b2188b2feb22f603db
2017-05-12 23:47:03 +00:00
Phil Weaver
f7ef513e03
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
...
am: be70654977
Change-Id: Ic03df1054b81144134968fb46fecbb07df43a823
2017-05-12 23:46:18 +00:00
Badhri Jagan Sridharan
296e5e3ee6
Merge "Use StartActivityForResult to launch the intent."
2017-05-12 23:21:47 +00:00
Doris Ling
01639b7504
Merge commit '071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b
...
Change-Id: I06f6e1bf1bbff0ac2e5ea7200432e8edb66ee1e3
Test: make RunSettingsRoboTests
2017-05-12 15:51:11 -07:00