OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoEnsure that the gesture animation video is paused properly. am: 4245ad4771 am: 5e4fce04fb
Doris Ling [Fri, 21 Oct 2016 23:51:21 +0000 (23:51 +0000)]
Ensure that the gesture animation video is paused properly. am: 4245ad4771 am: 5e4fce04fb
am: 12ffd7aaa7

Change-Id: I5c063fc4c1644a9d7e5360e91c1d79375f92986a

7 years agoEnsure that the gesture animation video is paused properly. am: 4245ad4771
Doris Ling [Fri, 21 Oct 2016 23:46:51 +0000 (23:46 +0000)]
Ensure that the gesture animation video is paused properly. am: 4245ad4771
am: 5e4fce04fb

Change-Id: Ic615738b57a4ca49f5c6101e86aea03dbf0f9a12

7 years agoEnsure that the gesture animation video is paused properly.
Doris Ling [Fri, 21 Oct 2016 23:44:19 +0000 (23:44 +0000)]
Ensure that the gesture animation video is paused properly.
am: 4245ad4771

Change-Id: Ib6bd653fe0f1fd0859c37df4655908e67ecc4444

7 years agoMerge "Add initial preferences to App&Notification screen."
TreeHugger Robot [Fri, 21 Oct 2016 22:20:40 +0000 (22:20 +0000)]
Merge "Add initial preferences to App&Notification screen."

7 years agoEnsure that the gesture animation video is paused properly.
Doris Ling [Fri, 21 Oct 2016 21:28:54 +0000 (14:28 -0700)]
Ensure that the gesture animation video is paused properly.

Add the handling to pause the animation video when user navigates away
from the gesture settings.

Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix: 32064123

Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17

7 years agoMerge "Elicit ItemsData class and add DiffUtil.Callback"
Lei Yu [Fri, 21 Oct 2016 20:52:18 +0000 (20:52 +0000)]
Merge "Elicit ItemsData class and add DiffUtil.Callback"

7 years agoAdd initial preferences to App&Notification screen.
Fan Zhang [Fri, 21 Oct 2016 00:15:50 +0000 (17:15 -0700)]
Add initial preferences to App&Notification screen.

Bug: 31799948
Test: manual
Change-Id: I93f9d6562f51d37fcd78bada2f7c37d6b16daabb

7 years agoElicit ItemsData class and add DiffUtil.Callback
jackqdyulei [Thu, 6 Oct 2016 01:05:52 +0000 (18:05 -0700)]
Elicit ItemsData class and add DiffUtil.Callback

In the previous version, when there is a minor change in data, we
will refresh the whole screen(and data) by invoking "recountItems"
and "notifyDataSetChanged", which did lots of unnecessary works.

In this new cl, I elicit ItemsData class, which encapsulates the list
data used in adapter. When data changed, I build another ItemsData and
use the DiffUtil.Callback to calculate diffs between ItemsDatas. In
this way we can only refresh the items that changed in adapter.

Since I cannot find usage of see_all.xml anymore, I delete the relevant
code as well as the resource files.

Bug: 30319913
Test: make RunSettingsRoboTests
Change-Id: I4f753a26f624affea6c6c35d49cfb9c43fb74fe6

7 years agoMerge "Support tile title text line wraps" into nyc-mr1-dev am: f5cd60372c am: 2da1ca120f
Matthew Fritze [Fri, 21 Oct 2016 16:54:09 +0000 (16:54 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev am: f5cd60372c am: 2da1ca120f
am: 1f8073efb9

Change-Id: I91e3c33f75a3879eb8b6832bd871909969538c1b

7 years agoSupport tile title text line wraps am: 0f813d668d am: 0e0e6c5544
Matthew Fritze [Fri, 21 Oct 2016 16:53:52 +0000 (16:53 +0000)]
Support tile title text line wraps am: 0f813d668d am: 0e0e6c5544
am: 86c8b2a1a5

Change-Id: I37e3c11aaa2f8fdd59b3f6e9a963c55661b81849

7 years agoMerge "Support tile title text line wraps" into nyc-mr1-dev am: f5cd60372c
Matthew Fritze [Fri, 21 Oct 2016 16:46:00 +0000 (16:46 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev am: f5cd60372c
am: 2da1ca120f

Change-Id: Ic447e8fbf664140f2580c4898e2a0b6618585543

7 years agoSupport tile title text line wraps am: 0f813d668d
Matthew Fritze [Fri, 21 Oct 2016 16:45:40 +0000 (16:45 +0000)]
Support tile title text line wraps am: 0f813d668d
am: 0e0e6c5544

Change-Id: I81fa4356f76b2693eca95ff5c79c6168a68ffd64

7 years agoMerge "Support tile title text line wraps" into nyc-mr1-dev
Matthew Fritze [Fri, 21 Oct 2016 16:36:20 +0000 (16:36 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev
am: f5cd60372c

Change-Id: Ie0d699bcc355519060df04b46b213ce368e47e6a

7 years agoSupport tile title text line wraps
Matthew Fritze [Fri, 21 Oct 2016 16:36:19 +0000 (16:36 +0000)]
Support tile title text line wraps
am: 0f813d668d

Change-Id: I47a4f7f95f0bce43a55e661209d48142f82e5b42

7 years agoMerge "Support tile title text line wraps" into nyc-mr1-dev
TreeHugger Robot [Fri, 21 Oct 2016 16:30:49 +0000 (16:30 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev

7 years agoMerge "Add preupload to Settings."
TreeHugger Robot [Fri, 21 Oct 2016 02:41:18 +0000 (02:41 +0000)]
Merge "Add preupload to Settings."

7 years agoSupport tile title text line wraps
Matthew Fritze [Thu, 20 Oct 2016 22:35:29 +0000 (15:35 -0700)]
Support tile title text line wraps

Change-Id: Ice430d03877618aacad21e5ee6167516f60f02fd
Fixes: 32239411
Test: Manual

7 years agoAdd preupload to Settings.
Philip P. Moltmann [Fri, 21 Oct 2016 00:22:28 +0000 (17:22 -0700)]
Add preupload to Settings.

Test: Uploaded
Change-Id: I454df2797ac7314060646c66c6caf2538d36b1d0

7 years agoMerge "Add empty page for App & Notifications"
TreeHugger Robot [Fri, 21 Oct 2016 00:20:13 +0000 (00:20 +0000)]
Merge "Add empty page for App & Notifications"

7 years agoMerge "Set stay awake while wireless charging."
Lei Yu [Thu, 20 Oct 2016 23:33:10 +0000 (23:33 +0000)]
Merge "Set stay awake while wireless charging."

7 years agoMerge "Move scrollview to be the parent view."
Lei Yu [Thu, 20 Oct 2016 23:03:14 +0000 (23:03 +0000)]
Merge "Move scrollview to be the parent view."

7 years agoAdd empty page for App & Notifications
Fan Zhang [Thu, 20 Oct 2016 19:47:52 +0000 (12:47 -0700)]
Add empty page for App & Notifications

Bug: 31799948
Test: manual
Change-Id: Iaab1a5988af30504d4e34ff4f63ae69e86b70f27

7 years agoMerge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am...
Fan Zhang [Thu, 20 Oct 2016 20:42:12 +0000 (20:42 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am: 08254e5b4f am: 723fbd06a9
am: b04bd44378

Change-Id: I433323262f8b3032a8e1588c9f032d9c005b9271

7 years agoFix help & feedback link in data usage summary screen. am: 9b52836251 am: 7568e120cf
Fan Zhang [Thu, 20 Oct 2016 20:41:55 +0000 (20:41 +0000)]
Fix help & feedback link in data usage summary screen. am: 9b52836251 am: 7568e120cf
am: dd387b6739

Change-Id: I7e8d85bcc2c599c61b3739f445756681b22a1ea8

7 years agoMerge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am...
Fan Zhang [Thu, 20 Oct 2016 20:34:04 +0000 (20:34 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am: 08254e5b4f
am: 723fbd06a9

Change-Id: Ief7d0f6e9d90c34f8b9405d4d13c4080f669c15c

7 years agoFix help & feedback link in data usage summary screen. am: 9b52836251
Fan Zhang [Thu, 20 Oct 2016 20:33:51 +0000 (20:33 +0000)]
Fix help & feedback link in data usage summary screen. am: 9b52836251
am: 7568e120cf

Change-Id: If7768bdf34204ca158dcf7e2078826a0aabc2ec7

7 years agoMove scrollview to be the parent view.
jackqdyulei [Tue, 18 Oct 2016 20:32:55 +0000 (13:32 -0700)]
Move scrollview to be the parent view.

In this cl, scroll view was moved to be the parent view for the
entire UI rather than only for a subset.

Bug: 32009766
Test: visual
Change-Id: I9aa8bb88cb39e1ca51737ec88640cc08910c4aef

7 years agoMerge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
Fan Zhang [Thu, 20 Oct 2016 20:25:38 +0000 (20:25 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
am: 08254e5b4f

Change-Id: Ia9c30a0a03a1dcaec42573c3578f5a1ed80aa9b6

7 years agoFix help & feedback link in data usage summary screen.
Fan Zhang [Thu, 20 Oct 2016 20:25:37 +0000 (20:25 +0000)]
Fix help & feedback link in data usage summary screen.
am: 9b52836251

Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674

7 years agoMerge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
TreeHugger Robot [Thu, 20 Oct 2016 20:18:44 +0000 (20:18 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev

7 years agoMerge "Make dashboard tile refresh more effcient."
TreeHugger Robot [Thu, 20 Oct 2016 19:03:28 +0000 (19:03 +0000)]
Merge "Make dashboard tile refresh more effcient."

7 years agoMake dashboard tile refresh more effcient.
Fan Zhang [Wed, 19 Oct 2016 21:15:34 +0000 (14:15 -0700)]
Make dashboard tile refresh more effcient.

Instead of removing and re-adding all dashboard tiles, figure out a diff
and rebind/add/remove as necessary.

Bug: 32255863
Test: RunSettingsRoboTests
Change-Id: I9d87ba30ab746257d0ea71282951348ebc4e8965

7 years agoImport translations. DO NOT MERGE am: 4bfccb32a7 -s ours am: 4559d2bfac -s ours...
Bill Yi [Thu, 20 Oct 2016 16:49:59 +0000 (16:49 +0000)]
Import translations. DO NOT MERGE am: 4bfccb32a7  -s ours am: 4559d2bfac  -s ours am: d0c5d246c8  -s ours
am: 871fd84ab3  -s ours

Change-Id: Id56b66ff193ce4a462f1e848a3ca5b5d4f8924eb

7 years agoImport translations. DO NOT MERGE am: 4bfccb32a7 -s ours am: 4559d2bfac -s ours
Bill Yi [Thu, 20 Oct 2016 16:41:12 +0000 (16:41 +0000)]
Import translations. DO NOT MERGE am: 4bfccb32a7  -s ours am: 4559d2bfac  -s ours
am: d0c5d246c8  -s ours

Change-Id: Ic8230d57c512c2ccbc54be5061caac490bcbe6d4

7 years agoImport translations. DO NOT MERGE am: 7e6e9220da -s ours am: d5bc80036b -s ours
Bill Yi [Thu, 20 Oct 2016 16:33:26 +0000 (16:33 +0000)]
Import translations. DO NOT MERGE am: 7e6e9220da  -s ours am: d5bc80036b  -s ours
am: e41b0705ee  -s ours

Change-Id: I28d4997cde7ae4552ff935ff6c02b408c45b87b9

7 years agoImport translations. DO NOT MERGE am: 4bfccb32a7 -s ours
Bill Yi [Thu, 20 Oct 2016 16:33:20 +0000 (16:33 +0000)]
Import translations. DO NOT MERGE am: 4bfccb32a7  -s ours
am: 4559d2bfac  -s ours

Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 16:25:35 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE
am: 4bfccb32a7  -s ours

Change-Id: I7c16649111b0057307773f7674c11c1aa9732c4c

7 years agoImport translations. DO NOT MERGE am: 7e6e9220da -s ours
Bill Yi [Thu, 20 Oct 2016 16:25:23 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE am: 7e6e9220da  -s ours
am: d5bc80036b  -s ours

Change-Id: I147e0e6546f7d367ff81d45bc66e7829bcf45267

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 16:17:21 +0000 (16:17 +0000)]
Import translations. DO NOT MERGE
am: 7e6e9220da  -s ours

Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748

7 years agoFix help & feedback link in data usage summary screen.
Fan Zhang [Thu, 20 Oct 2016 16:06:12 +0000 (09:06 -0700)]
Fix help & feedback link in data usage summary screen.

The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.

Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes: 32291069
Test: manual

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 14:52:52 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2490d08d85215767e05bf193c3e352c3ab7a7ce9
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 14:48:07 +0000 (07:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: I60964278429db5003b317b04e53324fc312116d5
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 14:40:28 +0000 (07:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: I753a2e09eb3df00ea60b8fbe761e78b407f5a043
Auto-generated-cl: translation import

7 years agoMerge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am...
Anna Galusza [Thu, 20 Oct 2016 03:57:15 +0000 (03:57 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am: ee502d5037 am: b104675957
am: d3bb66c47a

Change-Id: I4f998f93f2fca553656f1738f95d62ec28275b6c

7 years agoFix insufficint contrast on Vision Settings toggles. am: e212817785 am: 5bf1f668ff
Anna Galusza [Thu, 20 Oct 2016 03:57:00 +0000 (03:57 +0000)]
Fix insufficint contrast on Vision Settings toggles. am: e212817785 am: 5bf1f668ff
am: 0f2799799c

Change-Id: Idd8af227e76f36e6ca7fe148abba5ce065c21c38

7 years agoMerge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am...
Anna Galusza [Thu, 20 Oct 2016 03:46:56 +0000 (03:46 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am: ee502d5037
am: b104675957

Change-Id: Id3c38bf0f288ec55bdedb2029eac7c713773c4a9

7 years agoFix insufficint contrast on Vision Settings toggles. am: e212817785
Anna Galusza [Thu, 20 Oct 2016 03:46:42 +0000 (03:46 +0000)]
Fix insufficint contrast on Vision Settings toggles. am: e212817785
am: 5bf1f668ff

Change-Id: I0ac8ad8d8cd0091224c2bf1a76ac4845b4c6cf31

7 years agoMerge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
am: ee502d5037

Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5

7 years agoFix insufficint contrast on Vision Settings toggles.
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Fix insufficint contrast on Vision Settings toggles.
am: e212817785

Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd

7 years agoMerge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
Anna Galusza [Thu, 20 Oct 2016 03:32:22 +0000 (03:32 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev

7 years agoFix insufficint contrast on Vision Settings toggles.
Anna Galusza [Mon, 17 Oct 2016 19:23:08 +0000 (12:23 -0700)]
Fix insufficint contrast on Vision Settings toggles.

Bug: 29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132

7 years agoMerge "Fixes how we read the current WiFi network IP address."
Jaewoong Jung [Wed, 19 Oct 2016 21:21:59 +0000 (21:21 +0000)]
Merge "Fixes how we read the current WiFi network IP address."

7 years agoMove add/remove/findPref to ProgressiveDisclosureMixin.
Fan Zhang [Wed, 19 Oct 2016 19:00:32 +0000 (12:00 -0700)]
Move add/remove/findPref to ProgressiveDisclosureMixin.

This makes ProgressiveDisclosureMixin the authority for adding/removing
preferences so caller doesn't need to figure out if a preference is on
screen or collapsed.

Bug: 32255863
Test: make RunSettingsRoboTests -j40
Change-Id: I9bd69661b78efd4bb4913665f6ea09f6bdc231f5

7 years agoFixes how we read the current WiFi network IP address.
Jaewoong Jung [Thu, 13 Oct 2016 21:21:52 +0000 (14:21 -0700)]
Fixes how we read the current WiFi network IP address.

The old logic could read the current IP address only when the network has the
Internet access.

Bug: 31934577
Test: Manual inspection
Test: make RunSettingsRoboTests -j40

Change-Id: I46fe6f6fb4322e8245d3ac66ac6530228c226d16

7 years agoMerge "Add progressive disclsoure"
TreeHugger Robot [Wed, 19 Oct 2016 16:14:01 +0000 (16:14 +0000)]
Merge "Add progressive disclsoure"

7 years agoMerge "Updating colors as part of bluetooth refactoring"
Salvador Martinez [Wed, 19 Oct 2016 03:36:09 +0000 (03:36 +0000)]
Merge "Updating colors as part of bluetooth refactoring"

7 years agoMerge "Refactoring for bluetooth dialogs"
Salvador Martinez [Wed, 19 Oct 2016 03:36:09 +0000 (03:36 +0000)]
Merge "Refactoring for bluetooth dialogs"

7 years agoAdd progressive disclsoure
Fan Zhang [Tue, 18 Oct 2016 19:58:31 +0000 (12:58 -0700)]
Add progressive disclsoure

- Add a ProgressiveDisclosureMixin that contains all logic for collapse
  preference list when it's too long
- Refactored PreferenceController's updateState to take a preference
  instead of PreferenceScreen, because with progressive disclosure the
  preference can either be in screen or the mixin. DashboardFragment is
  responsible finding the preference before passing it to controller.

Bug: 32255863
Test: RunSettingsRoboTests

Change-Id: I6713abd61c954ce12732902e5b3ca4d4c0b1563e

7 years agoMerge "Add Sound to top level settings."
TreeHugger Robot [Tue, 18 Oct 2016 23:56:56 +0000 (23:56 +0000)]
Merge "Add Sound to top level settings."

7 years agoMerge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492 am: f33b98b750
Adrian Roos [Tue, 18 Oct 2016 22:50:13 +0000 (22:50 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492 am: f33b98b750
am: 3ba7aab582

Change-Id: If3a88583281aca94caaa7614460b9249a2689fc5

7 years agoMerge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
Adrian Roos [Tue, 18 Oct 2016 22:43:36 +0000 (22:43 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
am: f33b98b750

Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd

7 years agoSeparate ambient display triggers am: 82829ee0b1 am: 5ba2074e31
Adrian Roos [Tue, 18 Oct 2016 22:27:31 +0000 (22:27 +0000)]
Separate ambient display triggers am: 82829ee0b1 am: 5ba2074e31
am: c0dfa153f4

Change-Id: I2eed4a8bfbc8ded0f5d12b3284d8ae5a0cfb1823

7 years agoSeparate ambient display triggers am: 82829ee0b1
Adrian Roos [Tue, 18 Oct 2016 22:19:52 +0000 (22:19 +0000)]
Separate ambient display triggers am: 82829ee0b1
am: 5ba2074e31

Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c

7 years agoMerge "Separate ambient display triggers" into nyc-mr1-dev
Adrian Roos [Tue, 18 Oct 2016 22:16:39 +0000 (22:16 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am: ee5eef1492

Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48

7 years agoSeparate ambient display triggers
Adrian Roos [Tue, 18 Oct 2016 22:07:11 +0000 (22:07 +0000)]
Separate ambient display triggers
am: 82829ee0b1

Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62

7 years agoMerge "Separate ambient display triggers" into nyc-mr1-dev
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev

7 years agoAdd Sound to top level settings.
Doris Ling [Tue, 18 Oct 2016 20:08:29 +0000 (13:08 -0700)]
Add Sound to top level settings.

Fix: 31801516
Test: manual

Change-Id: I8325d21c8de9648c8de7b1489012d11c51aba7c1

7 years agoMerge "Layout change in support card and support dialog"
Lei Yu [Tue, 18 Oct 2016 20:14:20 +0000 (20:14 +0000)]
Merge "Layout change in support card and support dialog"

7 years agoMerge "Put divider back when IA is turned off."
TreeHugger Robot [Tue, 18 Oct 2016 18:34:59 +0000 (18:34 +0000)]
Merge "Put divider back when IA is turned off."

7 years agoRefactoring for bluetooth dialogs
Salvador Martinez [Tue, 4 Oct 2016 00:52:51 +0000 (17:52 -0700)]
Refactoring for bluetooth dialogs

Dialogs displayed when attempting to connect
to a bluetooth device have been refactored so
that they use a proper dialog fragment. Hardware
dependencies have also been refactored into a
controller class to make it possible to test
these dialogs as well as the controller
independently of one another.

Test: RoboTests
Bug: 32180625
Change-Id: I5447f8299bc13e139052635fc63546cbfc997f33

7 years agoMerge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev...
Lei Yu [Tue, 18 Oct 2016 17:13:48 +0000 (17:13 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am: 7fee46383f am: b4969f5b6f
am: f8866e2bfa

Change-Id: I8c6707dceea3a8b695f9259764eaff9a7d2a3938

7 years agoSuspend action in security patch when browser is disabled am: 013da34209 am: 221b9157b4
jackqdyulei [Tue, 18 Oct 2016 17:13:34 +0000 (17:13 +0000)]
Suspend action in security patch when browser is disabled am: 013da34209 am: 221b9157b4
am: ac49ccedb7

Change-Id: Ib4458b25bb12a928a9a258b2430877ca75a18f78

7 years agoMerge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev...
Lei Yu [Tue, 18 Oct 2016 17:09:29 +0000 (17:09 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am: 7fee46383f
am: b4969f5b6f

Change-Id: I81cf5f1bef06b9e3307df38d2e9e942f4be5f1e7

7 years agoSuspend action in security patch when browser is disabled am: 013da34209
jackqdyulei [Tue, 18 Oct 2016 17:09:15 +0000 (17:09 +0000)]
Suspend action in security patch when browser is disabled am: 013da34209
am: 221b9157b4

Change-Id: I09d1111f49a9d658629c2f1def0c1ed45f7b0ec4

7 years agoMerge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
Lei Yu [Tue, 18 Oct 2016 16:54:04 +0000 (16:54 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
am: 7fee46383f

Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72

7 years agoSuspend action in security patch when browser is disabled
jackqdyulei [Tue, 18 Oct 2016 16:54:03 +0000 (16:54 +0000)]
Suspend action in security patch when browser is disabled
am: 013da34209

Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0

7 years agoPut divider back when IA is turned off.
Fan Zhang [Tue, 18 Oct 2016 16:52:07 +0000 (09:52 -0700)]
Put divider back when IA is turned off.

Bug: 32231177
Test: manual
Change-Id: I657e0bb3b8721c494cd1a6272b370b54ae5063ec

7 years agoMerge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
Lei Yu [Tue, 18 Oct 2016 16:45:35 +0000 (16:45 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE am: 6515783df6 -s ours am: 37c5dd0fe3 -s ours...
Bill Yi [Tue, 18 Oct 2016 06:03:22 +0000 (06:03 +0000)]
Import translations. DO NOT MERGE am: 6515783df6  -s ours am: 37c5dd0fe3  -s ours am: a95e430c93  -s ours
am: 79a4b3160d  -s ours

Change-Id: Ia66d62f6c0f049546124c1d23157a2c95b6f73f1

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b -s ours...
Bill Yi [Tue, 18 Oct 2016 06:03:06 +0000 (06:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b  -s ours am: 987866df87  -s ours
am: cda385e996  -s ours

Change-Id: I319f972f8593cf853ffe3feef4669d2765e3298a

7 years agoImport translations. DO NOT MERGE am: ccde0787b8 -s ours am: 4367ed325e -s ours
Bill Yi [Tue, 18 Oct 2016 06:02:50 +0000 (06:02 +0000)]
Import translations. DO NOT MERGE am: ccde0787b8  -s ours am: 4367ed325e  -s ours
am: 3e664455dc  -s ours

Change-Id: I63ac14a3d355f0519b69b68c1f723aaa4a4da22b

7 years agoImport translations. DO NOT MERGE am: 6515783df6 -s ours am: 37c5dd0fe3 -s ours
Bill Yi [Tue, 18 Oct 2016 05:49:41 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE am: 6515783df6  -s ours am: 37c5dd0fe3  -s ours
am: a95e430c93  -s ours

Change-Id: I5704704614d94e10c1e5445d93fa28d584998d23

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b -s ours
Bill Yi [Tue, 18 Oct 2016 05:49:22 +0000 (05:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b  -s ours
am: 987866df87  -s ours

Change-Id: I004b43f4084e804c79e5b75b2e61448ecb4b0bdf

7 years agoImport translations. DO NOT MERGE am: ccde0787b8 -s ours
Bill Yi [Tue, 18 Oct 2016 05:49:02 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE am: ccde0787b8  -s ours
am: 4367ed325e  -s ours

Change-Id: I10c8b1a9a393fa87343ebc2802232f246357b9b8

7 years agoImport translations. DO NOT MERGE am: 6515783df6 -s ours
Bill Yi [Tue, 18 Oct 2016 05:40:29 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE am: 6515783df6  -s ours
am: 37c5dd0fe3  -s ours

Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 18 Oct 2016 05:40:02 +0000 (05:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 5ffabbe58b  -s ours

Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 18 Oct 2016 05:40:01 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE
am: ccde0787b8  -s ours

Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 18 Oct 2016 05:37:33 +0000 (05:37 +0000)]
Import translations. DO NOT MERGE
am: 6515783df6  -s ours

Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 05:30:53 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 18 Oct 2016 05:30:33 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Add move settings to system page."
TreeHugger Robot [Tue, 18 Oct 2016 00:47:27 +0000 (00:47 +0000)]
Merge "Add move settings to system page."

7 years agoUpdating colors as part of bluetooth refactoring
Salvador Martinez [Fri, 14 Oct 2016 22:42:08 +0000 (15:42 -0700)]
Updating colors as part of bluetooth refactoring

Dialogs for bluetooth pairing are being refactored.
This contains some trivial color changes that were
done at the same time.

Test: RoboTests
Bug: 32180625
Change-Id: I8807ab929faa95158ec6d7d336b2580a42bccf20

7 years agoAdd move settings to system page.
Fan Zhang [Mon, 17 Oct 2016 22:57:57 +0000 (15:57 -0700)]
Add move settings to system page.

Bug: 31801428
Test: manual
Change-Id: Ifc1f1190369a2f199e58700583bb3dfa251a1b4d

7 years agoMerge "Draw preference divider based on preference group."
Fan Zhang [Mon, 17 Oct 2016 22:42:44 +0000 (22:42 +0000)]
Merge "Draw preference divider based on preference group."

7 years agoLayout change in support card and support dialog
jackqdyulei [Tue, 11 Oct 2016 16:59:33 +0000 (09:59 -0700)]
Layout change in support card and support dialog

1. Wrap the support_disclaimer_content by scrollview.
2. Change the layout in support_escalation_options using layout_weight.
3. Add styles in layout-sw300dp and layout-sw400dp

The target scope is between 300dp->400dp, so I add the default style
in sw400dp and changed style in sw300dp to cover it.

Bug: 31399419
Test: Visual
Change-Id: I117acb0c5b992bea2cded6cd48749c4ed7b04488

7 years agoSuspend action in security patch when browser is disabled
jackqdyulei [Fri, 14 Oct 2016 20:53:14 +0000 (13:53 -0700)]
Suspend action in security patch when browser is disabled

When queryIntentActivities(intent, flag) return empty, don't send out
that intent to stop crash. This is a special catch only in security
patch.

Bug: 32054067
Test: Manual, hard to mock the situation to disable all the apps for
a specific action.

Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10

7 years agoSeparate ambient display triggers
Adrian Roos [Fri, 14 Oct 2016 20:03:55 +0000 (13:03 -0700)]
Separate ambient display triggers

Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.

Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work

7 years agoMerge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f...
Doris Ling [Mon, 17 Oct 2016 20:31:57 +0000 (20:31 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f5 am: 1a674eef53
am: b4a122b227

Change-Id: Idefb4b0e28a11eb62811b329be062ce813bb2eb5

7 years agoAdd static preview images to gesture settings. am: 12e4bebabf am: df7b815980
Doris Ling [Mon, 17 Oct 2016 20:31:49 +0000 (20:31 +0000)]
Add static preview images to gesture settings. am: 12e4bebabf am: df7b815980
am: fccee6adae

Change-Id: Ia745f80fa47a7316cb462918f900de001b1ecf03

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 17 Oct 2016 20:26:38 +0000 (13:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib4de644f9065e553dfd28458421aaba309a41de5
Auto-generated-cl: translation import