Adrian Roos
ee5eef1492
Merge "Separate ambient display triggers" into nyc-mr1-dev
2016-10-18 22:00:08 +00:00
Lei Yu
a5c421083a
Merge "Layout change in support card and support dialog"
2016-10-18 20:14:20 +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
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
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
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
99238ff174
Add static preview images to gesture settings. am: 12e4bebabf am: df7b815980
...
am: fccee6adae
2016-10-17 20:31:49 +00:00
Doris Ling
fccee6adae
Add static preview images to gesture settings. am: 12e4bebabf
...
am: df7b815980
2016-10-17 20:24:26 +00:00
Bill Yi
ccde0787b8
Import translations. DO NOT MERGE
...
Change-Id: I85609bede92b4ae044f1f98a101576447f93367f
Auto-generated-cl: translation import
2016-10-17 13:21:09 -07:00
Doris Ling
df7b815980
Add static preview images to gesture settings.
...
am: 12e4bebabf
2016-10-17 20:18:30 +00:00
Doris Ling
ec5314f2f5
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
2016-10-17 20:11:31 +00:00
Bill Yi
2943a2d942
Import translations. DO NOT MERGE
...
Change-Id: Ibfa2cefd09d0e3d59ce49b2e35bb5555caea32c0
Auto-generated-cl: translation import
2016-10-17 13:10:39 -07:00
Fan Zhang
be2ac27b67
Draw preference divider based on preference group.
...
Bug: 32179750
Test: RunSettingsRoboTests
Change-Id: I3ea1cd662c5baec825fae615883b94b26e648409
2016-10-17 10:16:04 -07:00
TreeHugger Robot
542fe0c0c3
Merge "Add summary provider for system tile."
2016-10-14 19:56:35 +00:00
Fan Zhang
e0c253fccb
Add summary provider for system tile.
...
Refactored getLocaleNames() into a FeatureProvider interface so it's
reusable and testable.
Bug: 31801428
Test: RunSettingsRoboTests
Change-Id: I2d31a66a4b32cfa7a364a4cfef1f6eea87084577
2016-10-14 11:08:51 -07:00
TreeHugger Robot
352c55594f
Merge "Show a disclaimer about enabling vpn lockdown"
2016-10-14 12:46:15 +00:00
TreeHugger Robot
1fb947bfee
Merge "Import translations. DO NOT MERGE"
2016-10-14 09:11:30 +00:00
Bill Yi
18a64f201b
Import translations. DO NOT MERGE
...
Change-Id: If676bfdcdc338204bedc7a678042d214d0cbc0a3
Auto-generated-cl: translation import
2016-10-13 15:30:06 -07:00
Bill Yi
e6fe46d880
Import translations. DO NOT MERGE
...
Change-Id: Ia650e465c441fbb127038ad378fe01d8ef86583c
Auto-generated-cl: translation import
2016-10-13 15:22:07 -07:00
Fan Zhang
f1acdd3a51
Add more preference controllers to network page.
...
- To support Mobile plan preference controller, extended
LifecycleObserver pattern to also observe onCreate and onSaveInstance.
Bug: 31799836
Test: RunSettingsRoboTests
Change-Id: Ie98db7efa91f0a8b4c8a06a784d3351237e59fe0
2016-10-13 15:01:18 -07:00
Doris Ling
b2c8c9cc9c
Add connected devices dashboard category for new IA.
...
Add the initial version for the connected devices category.
Test: RunSettingsRoboTests
Bug: 31800290
Change-Id: Ibacef7d5ceaae5e71ff5e5b1c35dafa7738e4f75
2016-10-12 15:27:19 -07:00
Fan Zhang
c4f07e2d9a
Merge "Add a new empty dashboard for Network & Internet."
2016-10-12 19:34:46 +00:00
Fan Zhang
bb93dc0242
Add a new empty dashboard for Network & Internet.
...
Bug: 31799836
Test: RunSettingsRoboTests
Change-Id: Ide0c07839332e615f6ba86fb87a1eb04cce2fae7
2016-10-12 10:24:42 -07:00
Doris Ling
dc9f6c71be
Remove pickup gesture settings if sensor is not found. am: 94e0da52fc am: 79aa718669
...
am: ef980e4dd1
2016-10-12 00:47:37 +00:00
Doris Ling
ef980e4dd1
Remove pickup gesture settings if sensor is not found. am: 94e0da52fc
...
am: 79aa718669
2016-10-12 00:35:58 +00:00
Doris Ling
79aa718669
Remove pickup gesture settings if sensor is not found.
...
am: 94e0da52fc
2016-10-12 00:23:46 +00:00
Doris Ling
12e4bebabf
Add static preview images to gesture settings.
...
Set the animation preview image view to the newly added preview image
instead of loading it from animation video.
Test: manual - launch gesture settings and visually check the animation
preview images.
Bug: 31636637
Change-Id: If25a0e3501bea0c6343326a143d665ec79e3d7c7
2016-10-11 16:44:58 -07:00
Doris Ling
49c0bab8bf
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
2016-10-11 23:42:42 +00:00
TreeHugger Robot
1c3ac5bca9
Merge "Reorder prefs in display settings for new info architecture"
2016-10-11 23:39:03 +00:00
Fan Zhang
99abc025b9
Reorder prefs in display settings for new info architecture
...
Bug: 31800242
Test: Visual inspection
Change-Id: I0cd0e7464eb05881a9b27e726caa1b1e0d211fb6
2016-10-11 14:50:31 -07:00
Doris Ling
94e0da52fc
Remove pickup gesture settings if sensor is not found.
...
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.
Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.
Bug: 32072298
Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
2016-10-11 14:23:59 -07:00
Nick Kralevich
d239fde717
Delete "Show CPU usage" am: 73dfef91b2 am: 0f3067ce58
...
am: a5a5ebfe5d
2016-10-11 18:20:41 +00:00
Nick Kralevich
a5a5ebfe5d
Delete "Show CPU usage" am: 73dfef91b2
...
am: 0f3067ce58
2016-10-11 18:14:34 +00:00
Nick Kralevich
0f3067ce58
Delete "Show CPU usage"
...
am: 73dfef91b2
2016-10-11 18:09:16 +00:00
Nick Kralevich
09d3961326
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
2016-10-11 18:03:30 +00:00
Nick Kralevich
73dfef91b2
Delete "Show CPU usage"
...
This functionality hasn't worked since Lollipop.
Bug: 21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
2016-10-11 09:03:29 -07:00
Bill Yi
6acf691f62
Import translations. DO NOT MERGE
...
Change-Id: Ic1133c6ddf9e2230e189751a04c58b953ef2b4c5
Auto-generated-cl: translation import
2016-10-10 12:31:59 -07:00
Bill Yi
90427c6c0a
Import translations. DO NOT MERGE
...
Change-Id: Id7b4a0335fdc650c0799b540b4fcf6b29f00850c
Auto-generated-cl: translation import
2016-10-10 12:17:24 -07:00
Matthew Fritze
6d24cd89ca
The center column of the support tab is back to white am: 2d07290453 am: 409714d0e4
...
am: a70964091a
2016-10-07 18:25:54 +00:00
Doris Ling
c037ed5bdb
Add condition check for double tap gesture settings. am: c8b7555fc9 am: 7f62890cad
...
am: a5eb66eb01
2016-10-07 18:15:40 +00:00
Robin Lee
b6f787c4df
Show a disclaimer about enabling vpn lockdown
...
Lockdown is now the default option, not best-effort mode. It's easier
to shoot oneself in the foot now so we'll show a warning to explain that
before switching it on.
Bug: 29052115
Bug: 29076208
Test: com.android.settings.vpn2.AppSettingsTest
Change-Id: Ia6845e6a7d57baa5476b8a021fb1255fd74aabea
2016-10-07 16:27:27 +01:00
TreeHugger Robot
fbe72822b4
Merge "Remove old unused activity."
2016-10-07 02:54:30 +00:00
Lorenzo Colitti
5a63070109
resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
...
am: 54ec71200b
2016-10-07 01:27:38 +00:00
Fan Zhang
d56ad9dc61
Remove old unused activity.
...
Test: compiles
Change-Id: Ida7e9ac0646e60a6cb91fc30b00b9c09f5fe3a8d
2016-10-06 17:03:37 -07:00
Matthew Fritze
a70964091a
The center column of the support tab is back to white am: 2d07290453
...
am: 409714d0e4
2016-10-06 22:53:33 +00:00
Matthew Fritze
409714d0e4
The center column of the support tab is back to white
...
am: 2d07290453
2016-10-06 22:49:56 +00:00
Matthew Fritze
9f95a59b88
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
2016-10-06 22:43:28 +00:00
Doris Ling
a5eb66eb01
Add condition check for double tap gesture settings. am: c8b7555fc9
...
am: 7f62890cad
2016-10-06 21:52:33 +00:00
