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
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
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
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
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
2017-05-13 06:57:44 +00:00
Bill Yi
e77c92c991
Import translations. DO NOT MERGE
...
am: 3b2d98c714
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
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
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
Maurice Lam
2eb170cd6f
Clean up choose lock intent creation
...
Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.
Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.
Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb
2017-05-12 15:35:20 -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
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
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
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
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
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
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
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
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
2017-05-12 22:07:24 +00:00
Doris Ling
071aa6b88b
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
...
am: d821a32b8e
2017-05-12 22:06:32 +00:00
Phil Weaver
11b6279ed4
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
...
am: beb7f31d67
2017-05-12 22:05:52 +00:00
Phil Weaver
beb7f31d67
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
...
am: 5d6d70a50e
2017-05-12 22:02:53 +00:00
Phil Weaver
5d6d70a50e
Don't enable a11y service if scary dialog obscured
...
am: 9a1b4eb21f
2017-05-12 22:00:23 +00:00
TreeHugger Robot
d821a32b8e
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
2017-05-12 21:54:22 +00:00
TreeHugger Robot
1949776c59
Merge "Hide app info link for "All work apps" data usage detail"
2017-05-12 21:31:09 +00:00
Fan Zhang
64ea8403bf
Merge "Add a no-op activity to handle development setting intent." into oc-dev am: 0036ef2cf0
...
am: 2fdb45913b
2017-05-12 20:59:40 +00:00
Fan Zhang
2fdb45913b
Merge "Add a no-op activity to handle development setting intent." into oc-dev
...
am: 0036ef2cf0
2017-05-12 20:42:53 +00:00
Juan Lang
a5f0a82f8f
Merge changes from topic 'footer-settingslib'
...
* changes:
Depend on SettingsLib's version of lifecycle and FooterMixin.
Add a factory method to create a Lifecycle.
2017-05-12 20:24:05 +00:00
TreeHugger Robot
0036ef2cf0
Merge "Add a no-op activity to handle development setting intent." into oc-dev
2017-05-12 20:16:20 +00:00
Sudheer Shanka
b13d0c5d2f
Merge "Update FakeUid to include new methods." into oc-dev am: 129369e58e
...
am: 2c49941e5a
2017-05-12 18:18:33 +00:00
TreeHugger Robot
2270c87100
Merge "Revert "Revert "Filter and display top 3 suggestions for exclusive type"""
2017-05-12 18:14:49 +00:00
Fan Zhang
59fd017ce5
Revert "Revert "Filter and display top 3 suggestions for exclusive type""
...
This reverts commit 184ae963e7
2017-05-12 18:12:58 +00:00
