Amith Yamasani
8b0ff9ac9c
Fix compile error in Settings
...
Change-Id: I2fab97a3a2ed99d2c24e67990be1ea21987af3db
2014-06-04 17:31:51 -07:00
Adrian Roos
988348c67b
Merge "Ensure trust agents are only provided by platform packages"
2014-06-04 21:53:56 +00:00
Adrian Roos
fe8572a056
Merge "Ensure trust agents are only provided by platform packages - DO NOT MERGE" into lmp-preview-dev
2014-06-04 21:43:47 +00:00
John Spurlock
5525cf4daf
am 6430ac5c
: Merge "ZenSettings: Hide the settings-specific condition picker." into lmp-preview-dev
...
* commit '6430ac5c1eeca8c67e99b820bcfa641e002e537f':
ZenSettings: Hide the settings-specific condition picker.
2014-06-04 21:31:54 +00:00
John Spurlock
864c31a131
am 8f847cb6
: Merge "Settings: Use standard small text for subtitle." into lmp-preview-dev
...
* commit '8f847cb6bdf6209e2528dd98f35eda215cd6d5e0':
Settings: Use standard small text for subtitle.
2014-06-04 20:52:39 +00:00
John Spurlock
f8ecb30715
am fe002e21
: Settings: Remove quick settings options for daltonizer.
...
* commit 'fe002e21a8870ece95516be99e42a130db2068c4':
Settings: Remove quick settings options for daltonizer.
2014-06-04 20:52:16 +00:00
24a746b958
Update the settings due to a framework API change.
...
Change-Id: I5248b2a6c9f6d9ac60e9b21a0f5377b19c9a3b36
2014-06-04 13:14:09 -07:00
Fabrice Di Meglio
044b73509c
am 5b210dd5
: Merge "Wi-Fi assets delivery for Quantum - part 2" into lmp-preview-dev
...
* commit '5b210dd572d511c9f57012588745eb99410a7181':
Wi-Fi assets delivery for Quantum - part 2
2014-06-04 18:45:27 +00:00
Fabrice Di Meglio
eb9e00ffe5
am 386a1c03
: Merge "Wi-Fi assets delivery for Quantum" into lmp-preview-dev
...
* commit '386a1c03966c507d029ab79f0c493f6a68856fe2':
Wi-Fi assets delivery for Quantum
2014-06-04 18:45:13 +00:00
Alan Viverette
987773bf39
am 5b7c8da9
: Merge "Fix search icon theme" into lmp-preview-dev
...
* commit '5b7c8da98062913f7e7a36aa81af7297f8ce58e5':
Fix search icon theme
2014-06-04 18:45:11 +00:00
Fabrice Di Meglio
15c05b028f
am 31335eaf
: Fix bug #15410103 Wi-Fi Dialog needs theme updates
...
* commit '31335eafbe552f0d9ca91ac9dd5f489a04a7ced3':
Fix bug #15410103 Wi-Fi Dialog needs theme updates
2014-06-04 18:44:40 +00:00
Alan Viverette
b763e69742
am f541710a
: Merge "Remove colorPrimaryLight, update to use colorAccent for controls" into lmp-preview-dev
...
* commit 'f541710a34576bb75428dc77b3b1c514763a33b3':
Remove colorPrimaryLight, update to use colorAccent for controls
2014-06-04 18:44:40 +00:00
Fabrice Di Meglio
53ac1e2717
am 302f75d6
: Tune Search Results layout
...
* commit '302f75d6e6005e46e4500f3419bf1010202765e1':
Tune Search Results layout
2014-06-04 18:44:39 +00:00
Fabrice Di Meglio
f25642cb86
am 19250a91
: Fix usage of android:style/Theme.Quantum.Light.DialogWhenLarge
...
* commit '19250a91df542465a1713d5a290315c9118b2091':
Fix usage of android:style/Theme.Quantum.Light.DialogWhenLarge
2014-06-04 18:44:39 +00:00
Fabrice Di Meglio
9d858c9562
am 9b9c97e7
: Merge "Update Recents Searches and Search Results padding" into lmp-preview-dev
...
* commit '9b9c97e7505bca802547f81de8aff5b1d55176f6':
Update Recents Searches and Search Results padding
2014-06-04 18:44:39 +00:00
Alan Viverette
7385ad9ac2
am 1eb52831
: Fix theme resolution in account preferences
...
* commit '1eb528318cdeb5c5ff1be469435538dad133882b':
Fix theme resolution in account preferences
2014-06-04 18:44:39 +00:00
John Spurlock
6430ac5c1e
Merge "ZenSettings: Hide the settings-specific condition picker." into lmp-preview-dev
2014-06-04 18:37:30 +00:00
John Spurlock
c65bd0c940
ZenSettings: Hide the settings-specific condition picker.
...
Bug:15424280
Change-Id: Iacfce340d070bf9873603865d59552709a329de9
2014-06-04 14:35:43 -04:00
Dianne Hackborn
1666d47fa2
am a4e854fa
: Merge "Tweak battery usage to match red lines." into lmp-preview-dev
...
* commit 'a4e854fa5b9f5adc4898088f6d454dd92f4238a5':
Tweak battery usage to match red lines.
2014-06-04 18:08:33 +00:00
Fabrice Di Meglio
2d89840b5c
am 734290e9
: Merge "Setting Dashboard - padding updates" into lmp-preview-dev
...
* commit '734290e9eaf1169bfa91e68307708fb7516913bc':
Setting Dashboard - padding updates
2014-06-04 18:08:33 +00:00
Fabrice Di Meglio
475f5b73c2
am 6ba7075a
: Merge "Entire Switch bar should be a touch state" into lmp-preview-dev
...
* commit '6ba7075ae8afb1edc5cb7864bc71121c9992903f':
Entire Switch bar should be a touch state
2014-06-04 18:08:32 +00:00
Adrian Roos
f7c460d8d6
am 4e2104b1
: Merge "Follow up to "A better brightness"" into lmp-preview-dev
...
* commit '4e2104b1191e5c3a049ebc159150fbb9a7bc2d03':
Follow up to "A better brightness"
2014-06-04 18:08:32 +00:00
Fabrice Di Meglio
252ba19c8a
am 4c448734
: Merge "Push Local Printer Search action to the ActionMenu" into lmp-preview-dev
...
* commit '4c44873435b96b127454272e9a8bf0490b268ed7':
Push Local Printer Search action to the ActionMenu
2014-06-04 18:08:32 +00:00
John Spurlock
8f847cb6bd
Merge "Settings: Use standard small text for subtitle." into lmp-preview-dev
2014-06-04 16:29:52 +00:00
John Spurlock
5b82f4f2c7
Settings: Use standard small text for subtitle.
...
In App notifications.
Bug:15423920
Change-Id: I493189d92b4e1447c4dd40bd5070a36d2e176bb0
2014-06-04 12:28:21 -04:00
John Spurlock
fe002e21a8
Settings: Remove quick settings options for daltonizer.
...
Bug:15424806
Change-Id: I91a9cd974d9e370f899e7573d00f6d27fe2e5538
2014-06-04 11:12:30 -04:00
Adrian Roos
4c8fd9e0cf
Ensure trust agents are only provided by platform packages - DO NOT MERGE
...
Ensures that Settings only shows TrustAgentServices from
platform packages.
Bug: 15287044
Change-Id: I6c7f62e61f9dd63cbcf4d2f8eb75986b0a314a46
2014-06-04 13:55:48 +00:00
Adrian Roos
da11363812
Ensure trust agents are only provided by platform packages
...
Ensures that Settings only shows TrustAgentServices from
platform packages.
Bug: 15287044
Change-Id: I62c131d99c7266f8617ec32a50a4f5549a07b4b7
2014-06-04 15:55:29 +02:00
Jean Chalard
976d0ce7f1
Allow multiple shortcuts for a personal dictionary word
...
Bug: 13869301
Change-Id: I040613bdddc9f18875e29f3382418476262b00ce
2014-06-04 22:00:00 +09:00
Alexandra Gherghina
820848a038
Merge "Move personal account settings to a new screen."
2014-06-04 07:48:14 +00:00
Alexandra Gherghina
ba63597d5a
Move personal account settings to a new screen.
...
This does not include work account settings.
Bug: 13656853
Change-Id: I105044f8261b1c656ed5053b3c02c02cfaae90d1
2014-06-04 08:44:39 +01:00
Baligh Uddin
9bf759c3cd
Merge "Looks like code is still referencing a dead string."
2014-06-04 05:28:39 +00:00
Baligh Uddin
9747386843
Looks like code is still referencing a dead string.
...
Revert "Import translations. DO NOT MERGE"
This reverts commit 460d5b7400
.
Change-Id: I2dbd9cc37413b6612538bf567aa7482fd77f8fb2
2014-06-04 05:28:30 +00:00
Baligh Uddin
35bf3a8116
Merge "Import translations. DO NOT MERGE"
2014-06-04 04:50:35 +00:00
Fabrice Di Meglio
5b210dd572
Merge "Wi-Fi assets delivery for Quantum - part 2" into lmp-preview-dev
2014-06-04 02:29:21 +00:00
Fabrice Di Meglio
896b16a754
Wi-Fi assets delivery for Quantum - part 2
...
- add missin xxxhdpi ones
See bug: #15117166 Network Strength Indicator Icon in WiFi Settings for I/O
Change-Id: Ice4d0a298a22a7902c103623c58bbe8032a78454
2014-06-03 19:25:02 -07:00
Fabrice Di Meglio
386a1c0396
Merge "Wi-Fi assets delivery for Quantum" into lmp-preview-dev
2014-06-04 01:32:59 +00:00
Fabrice Di Meglio
0bf7e9920d
Wi-Fi assets delivery for Quantum
...
See bug: #15117166 Network Strength Indicator Icon in WiFi Settings for I/O
Change-Id: I0c5a4df094523b3a7df44852b1a5dc5318c52504
2014-06-03 18:30:06 -07:00
Alan Viverette
5b7c8da980
Merge "Fix search icon theme" into lmp-preview-dev
2014-06-04 01:17:36 +00:00
Alan Viverette
b1a9903790
Fix search icon theme
...
Change-Id: I4140e3d55008f950ab4949713ad0e5d58b847a91
2014-06-03 17:36:09 -07:00
Fabrice Di Meglio
31335eafbe
Fix bug #15410103 Wi-Fi Dialog needs theme updates
...
- apply the correct Theme to the AlertDialog
Change-Id: I39a33b6a6630b6ba89f60a5a28fd8295687a86d1
2014-06-03 16:34:17 -07:00
Alan Viverette
f541710a34
Merge "Remove colorPrimaryLight, update to use colorAccent for controls" into lmp-preview-dev
2014-06-03 22:44:12 +00:00
Fabrice Di Meglio
302f75d6e6
Tune Search Results layout
...
- make the summary view as GONE when its text is empty
See bug: #12910134 Implement Search into the Settings App
Change-Id: Iafd680706b937137eaa30692e1c57a77cb5d7fc8
2014-06-03 15:29:08 -07:00
Alan Viverette
57ce7e7f40
Remove colorPrimaryLight, update to use colorAccent for controls
...
Change-Id: I827298ef91cfa35ed29171c52da2bb5033ed2f77
2014-06-03 14:46:13 -07:00
Fabrice Di Meglio
19250a91df
Fix usage of android:style/Theme.Quantum.Light.DialogWhenLarge
...
- make some Theme that are DialogWhenLarge but also respectful of
the Settings colors for the ActionBar
See bug: 15408411 Settings > Add account - needs to update theme
Change-Id: Ie96a94d03a2ea06fcbd19638f5d38e22e209fd31
2014-06-03 14:41:06 -07:00
Fabrice Di Meglio
9b9c97e750
Merge "Update Recents Searches and Search Results padding" into lmp-preview-dev
2014-06-03 20:33:54 +00:00
Fabrice Di Meglio
d15de56ba1
Update Recents Searches and Search Results padding
...
- for matching the ones from the main Dashboard too
- udpate also the Titles to match the categories title appearance
from the Dashboard
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I6d4731dbbd049b77e8c103bc21e9d0be5c0234dd
2014-06-03 13:32:21 -07:00
Alan Viverette
1eb528318c
Fix theme resolution in account preferences
...
BUG: 13341461
Change-Id: Idb42ad4026d63900b62f911782e07092216d906e
2014-06-03 11:15:54 -07:00
John Spurlock
959dac4f16
am 2ca1a3f5
: Settings: update bug report shortcut summary.
...
* commit '2ca1a3f5ff2dc013ddac920ca5a9eef161335df9':
Settings: update bug report shortcut summary.
2014-06-03 17:15:41 +00:00
Dianne Hackborn
a4e854fa5b
Merge "Tweak battery usage to match red lines." into lmp-preview-dev
2014-06-03 00:21:30 +00:00