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
2016-10-18 22:50:13 +00:00
Adrian Roos
3ba7aab582
Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
...
am: f33b98b750
2016-10-18 22:43:36 +00:00
Adrian Roos
2bd8835fda
Separate ambient display triggers am: 82829ee0b1 am: 5ba2074e31
...
am: c0dfa153f4
2016-10-18 22:27:31 +00:00
Adrian Roos
c0dfa153f4
Separate ambient display triggers am: 82829ee0b1
...
am: 5ba2074e31
2016-10-18 22:19:52 +00:00
Adrian Roos
f33b98b750
Merge "Separate ambient display triggers" into nyc-mr1-dev
...
am: ee5eef1492
2016-10-18 22:16:39 +00:00
Adrian Roos
5ba2074e31
Separate ambient display triggers
...
am: 82829ee0b1
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
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
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
2016-10-18 17:09:29 +00:00
jackqdyulei
ac49ccedb7
Suspend action in security patch when browser is disabled am: 013da34209
...
am: 221b9157b4
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
2016-10-18 16:54:04 +00:00
jackqdyulei
221b9157b4
Suspend action in security patch when browser is disabled
...
am: 013da34209
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
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
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
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
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
2016-10-18 05:49:22 +00:00
Bill Yi
3e664455dc
Import translations. DO NOT MERGE am: ccde0787b8 -s ours
...
am: 4367ed325e
2016-10-18 05:49:02 +00:00
Bill Yi
a95e430c93
Import translations. DO NOT MERGE am: 6515783df6 -s ours
...
am: 37c5dd0fe3
2016-10-18 05:40:29 +00:00
Bill Yi
987866df87
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 5ffabbe58b
2016-10-18 05:40:02 +00:00
Bill Yi
4367ed325e
Import translations. DO NOT MERGE
...
am: ccde0787b8
2016-10-18 05:40:01 +00:00
Bill Yi
37c5dd0fe3
Import translations. DO NOT MERGE
...
am: 6515783df6
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
Fan Zhang
98cb0ace7f
Merge "Draw preference divider based on preference group."
2016-10-17 22:42:44 +00:00
jackqdyulei
a709e7546e
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
2016-10-17 15:12:37 -07:00
jackqdyulei
013da34209
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
2016-10-17 14:35:15 -07:00
Adrian Roos
82829ee0b1
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
2016-10-17 14:05:53 -07:00
Doris Ling
0ca61afa3b
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f5 am: 1a674eef53
...
am: b4a122b227
2016-10-17 20:31:57 +00:00
Doris Ling
99238ff174
Add static preview images to gesture settings. am: 12e4bebabf am: df7b815980
...
am: fccee6adae
2016-10-17 20:31:49 +00:00
Bill Yi
6515783df6
Import translations. DO NOT MERGE
...
Change-Id: Ib4de644f9065e553dfd28458421aaba309a41de5
Auto-generated-cl: translation import
2016-10-17 13:26:38 -07:00
Doris Ling
b4a122b227
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f5
...
am: 1a674eef53
2016-10-17 20:24:34 +00:00
