Anna Galusza
1a0343c0b1
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am: ee502d5037
am: b104675957
...
am: d3bb66c47a
Change-Id: I4f998f93f2fca553656f1738f95d62ec28275b6c
2016-10-20 03:57:15 +00:00
Anna Galusza
34cebb88fd
Fix insufficint contrast on Vision Settings toggles. am: e212817785
am: 5bf1f668ff
...
am: 0f2799799c
Change-Id: Idd8af227e76f36e6ca7fe148abba5ce065c21c38
2016-10-20 03:57:00 +00:00
Anna Galusza
d3bb66c47a
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am: ee502d5037
...
am: b104675957
Change-Id: Id3c38bf0f288ec55bdedb2029eac7c713773c4a9
2016-10-20 03:46:56 +00:00
Anna Galusza
0f2799799c
Fix insufficint contrast on Vision Settings toggles. am: e212817785
...
am: 5bf1f668ff
Change-Id: I0ac8ad8d8cd0091224c2bf1a76ac4845b4c6cf31
2016-10-20 03:46:42 +00:00
Anna Galusza
b104675957
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
...
am: ee502d5037
Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5
2016-10-20 03:38:11 +00:00
Anna Galusza
5bf1f668ff
Fix insufficint contrast on Vision Settings toggles.
...
am: e212817785
Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd
2016-10-20 03:38:11 +00:00
Anna Galusza
ee502d5037
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
2016-10-20 03:32:22 +00:00
Anna Galusza
e212817785
Fix insufficint contrast on Vision Settings toggles.
...
Bug: 29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
2016-10-19 15:41:00 -07:00
Jaewoong Jung
35d94ff9cc
Merge "Fixes how we read the current WiFi network IP address."
2016-10-19 21:21:59 +00:00
Fan Zhang
8b5bca5937
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
2016-10-19 12:19:46 -07:00
Jaewoong Jung
c260e6dc87
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
2016-10-19 12:08:54 -07:00
TreeHugger Robot
0f67bedaf6
Merge "Add progressive disclsoure"
2016-10-19 16:14:01 +00:00
Salvador Martinez
1a3d8d6c94
Merge "Updating colors as part of bluetooth refactoring"
2016-10-19 03:36:12 +00:00
Salvador Martinez
37059a587f
Merge "Refactoring for bluetooth dialogs"
2016-10-19 03:36:12 +00:00
Fan Zhang
db1112a221
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
2016-10-18 16:57:11 -07:00
TreeHugger Robot
7d00dccf6b
Merge "Add Sound to top level settings."
2016-10-18 23:56:57 +00:00
Adrian Roos
836a781893
Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
am: f33b98b750
...
am: 3ba7aab582
Change-Id: If3a88583281aca94caaa7614460b9249a2689fc5
2016-10-18 22:50:13 +00:00
Adrian Roos
3ba7aab582
Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
...
am: f33b98b750
Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd
2016-10-18 22:43:36 +00:00
Adrian Roos
2bd8835fda
Separate ambient display triggers am: 82829ee0b1
am: 5ba2074e31
...
am: c0dfa153f4
Change-Id: I2eed4a8bfbc8ded0f5d12b3284d8ae5a0cfb1823
2016-10-18 22:27:31 +00:00
Adrian Roos
c0dfa153f4
Separate ambient display triggers am: 82829ee0b1
...
am: 5ba2074e31
Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c
2016-10-18 22:19:52 +00:00
Adrian Roos
f33b98b750
Merge "Separate ambient display triggers" into nyc-mr1-dev
...
am: ee5eef1492
Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48
2016-10-18 22:16:39 +00:00
Adrian Roos
5ba2074e31
Separate ambient display triggers
...
am: 82829ee0b1
Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62
2016-10-18 22:07:11 +00:00
Adrian Roos
ee5eef1492
Merge "Separate ambient display triggers" into nyc-mr1-dev
2016-10-18 22:00:08 +00:00
Doris Ling
55578653f4
Add Sound to top level settings.
...
Fix: 31801516
Test: manual
Change-Id: I8325d21c8de9648c8de7b1489012d11c51aba7c1
2016-10-18 13:37:37 -07:00
Lei Yu
a5c421083a
Merge "Layout change in support card and support dialog"
2016-10-18 20:14:20 +00:00
TreeHugger Robot
84ec452cd7
Merge "Put divider back when IA is turned off."
2016-10-18 18:35:00 +00:00
Salvador Martinez
d98d0837d8
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
2016-10-18 11:13:44 -07:00
Lei Yu
c33b78df9c
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am: 7fee46383f
am: b4969f5b6f
...
am: f8866e2bfa
Change-Id: I8c6707dceea3a8b695f9259764eaff9a7d2a3938
2016-10-18 17:13:48 +00:00
jackqdyulei
792bf32886
Suspend action in security patch when browser is disabled am: 013da34209
am: 221b9157b4
...
am: ac49ccedb7
Change-Id: Ib4458b25bb12a928a9a258b2430877ca75a18f78
2016-10-18 17:13:34 +00:00
Lei Yu
f8866e2bfa
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am: 7fee46383f
...
am: b4969f5b6f
Change-Id: I81cf5f1bef06b9e3307df38d2e9e942f4be5f1e7
2016-10-18 17:09:29 +00:00
jackqdyulei
ac49ccedb7
Suspend action in security patch when browser is disabled am: 013da34209
...
am: 221b9157b4
Change-Id: I09d1111f49a9d658629c2f1def0c1ed45f7b0ec4
2016-10-18 17:09:15 +00:00
Lei Yu
b4969f5b6f
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
...
am: 7fee46383f
Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72
2016-10-18 16:54:04 +00:00
jackqdyulei
221b9157b4
Suspend action in security patch when browser is disabled
...
am: 013da34209
Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
2016-10-18 16:54:03 +00:00
Fan Zhang
8da724a8bb
Put divider back when IA is turned off.
...
Bug: 32231177
Test: manual
Change-Id: I657e0bb3b8721c494cd1a6272b370b54ae5063ec
2016-10-18 09:52:07 -07:00
Lei Yu
7fee46383f
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
2016-10-18 16:45:35 +00:00
Bill Yi
58b9b14167
Import translations. DO NOT MERGE am: 6515783df6
-s ours am: 37c5dd0fe3
-s ours am: a95e430c93
-s ours
...
am: 79a4b3160d
-s ours
Change-Id: Ia66d62f6c0f049546124c1d23157a2c95b6f73f1
2016-10-18 06:03:22 +00:00
Bill Yi
032b20058a
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
2016-10-18 06:03:06 +00:00
Bill Yi
dc8af3b953
Import translations. DO NOT MERGE am: ccde0787b8
-s ours am: 4367ed325e
-s ours
...
am: 3e664455dc
-s ours
Change-Id: I63ac14a3d355f0519b69b68c1f723aaa4a4da22b
2016-10-18 06:02:50 +00:00
Bill Yi
79a4b3160d
Import translations. DO NOT MERGE am: 6515783df6
-s ours am: 37c5dd0fe3
-s ours
...
am: a95e430c93
-s ours
Change-Id: I5704704614d94e10c1e5445d93fa28d584998d23
2016-10-18 05:49:41 +00:00
Bill Yi
cda385e996
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b
-s ours
...
am: 987866df87
-s ours
Change-Id: I004b43f4084e804c79e5b75b2e61448ecb4b0bdf
2016-10-18 05:49:22 +00:00
Bill Yi
3e664455dc
Import translations. DO NOT MERGE am: ccde0787b8
-s ours
...
am: 4367ed325e
-s ours
Change-Id: I10c8b1a9a393fa87343ebc2802232f246357b9b8
2016-10-18 05:49:02 +00:00
Bill Yi
a95e430c93
Import translations. DO NOT MERGE am: 6515783df6
-s ours
...
am: 37c5dd0fe3
-s ours
Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8
2016-10-18 05:40:29 +00:00
Bill Yi
987866df87
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 5ffabbe58b
-s ours
Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf
2016-10-18 05:40:02 +00:00
Bill Yi
4367ed325e
Import translations. DO NOT MERGE
...
am: ccde0787b8
-s ours
Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109
2016-10-18 05:40:01 +00:00
Bill Yi
37c5dd0fe3
Import translations. DO NOT MERGE
...
am: 6515783df6
-s ours
Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894
2016-10-18 05:37:33 +00:00
TreeHugger Robot
5ffabbe58b
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-18 05:30:53 +00:00
TreeHugger Robot
0bfea1fe1a
Merge "Import translations. DO NOT MERGE"
2016-10-18 05:30:34 +00:00
TreeHugger Robot
46017eff74
Merge "Add move settings to system page."
2016-10-18 00:47:28 +00:00
Salvador Martinez
d03dd83d2d
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
2016-10-17 16:10:03 -07:00
Fan Zhang
1fa096ad4e
Add move settings to system page.
...
Bug: 31801428
Test: manual
Change-Id: Ifc1f1190369a2f199e58700583bb3dfa251a1b4d
2016-10-17 15:58:28 -07:00