Julia Reynolds
c92af83b0c
Merge "Settings user restriction changes: wireless & networks changes."
2014-06-09 19:22:19 +00:00
Fabrice Di Meglio
fd4a80ed67
am 38e0a866
: Merge "Update "NFC & more" Dashboard icon" into lmp-preview-dev
...
* commit '38e0a866182c4a534cc33dab2c9fcaab4f8d53cc':
Update "NFC & more" Dashboard icon
2014-06-07 10:01:19 +00:00
Fabrice Di Meglio
38e0a86618
Merge "Update "NFC & more" Dashboard icon" into lmp-preview-dev
2014-06-07 00:22:26 +00:00
Fabrice Di Meglio
afe71eb85b
Update "NFC & more" Dashboard icon
...
- caveat: we dont have the hdpi density in that delivery
See bug: #15450825 Dashboard "NFC & more" icon is not the correct size
Change-Id: I4193c219bab3836554bc02172c93b3d3047cf907
2014-06-06 17:20:04 -07:00
Alan Viverette
80814f5314
Material theme
...
BUG; 15467097
Change-Id: Ifeda3f6cc1554c4d31357d5010df6958113df964
2014-06-06 15:27:32 -07:00
Alan Viverette
5c8f1352e4
DO NOT MERGE Material theme
...
BUG; 15467097
Change-Id: Ifeda3f6cc1554c4d31357d5010df6958113df964
2014-06-06 14:33:10 -07:00
Fabrice Di Meglio
113c4c03ee
am b76de1d4
: Tune Dashboard layouts following UX spec - part 3
...
* commit 'b76de1d4fabf8381d73df22439e6fac839bd33e7':
Tune Dashboard layouts following UX spec - part 3
2014-06-06 20:57:23 +00:00
Fabrice Di Meglio
b76de1d4fa
Tune Dashboard layouts following UX spec - part 3
...
- remove this ugly 12dp at the bottom of the Dashboard and
use 1dp instead
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I07695b2084a389552fb8a0e89663304c0c29cf58
2014-06-06 12:22:32 -07:00
Fabrice Di Meglio
2b552ac0dd
am 132652c5
: Do not show the Preference summary in Search results
...
* commit '132652c5576462f036ed9437720b15b0c31430e4':
Do not show the Preference summary in Search results
2014-06-06 02:22:41 +00:00
Fabrice Di Meglio
132652c557
Do not show the Preference summary in Search results
...
- as the summary was sometimes showing "Unknown" or even not the
real Preference value (we dont have right now the capability to
know the current value of a Preference), so it is better to be
safe than sorry.
Change-Id: I009c31fc41ad35a630f4b34aa0ef998932f65263
2014-06-05 19:15:02 -07:00
Fabrice Di Meglio
5f546fbb1d
am 21d26574
: Tune Search layouts following UX spec
...
* commit '21d26574eb1ddd61aea9775c57dafbcaaf2ef77a':
Tune Search layouts following UX spec
2014-06-06 01:55:19 +00:00
Fabrice Di Meglio
21d26574eb
Tune Search layouts following UX spec
...
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: Ia7839459b3d67529db55e70c0ecda3da9b37d840
2014-06-05 18:32:44 -07:00
Fabrice Di Meglio
303b7780ae
am 1b526607
: Merge "Tune Dashboard layouts following UX spec - part 2" into lmp-preview-dev
...
* commit '1b5266070b6ab84976158f6f0fb213bfb5ba8fb7':
Tune Dashboard layouts following UX spec - part 2
2014-06-06 00:42:01 +00:00
Fabrice Di Meglio
1b5266070b
Merge "Tune Dashboard layouts following UX spec - part 2" into lmp-preview-dev
2014-06-06 00:39:47 +00:00
Fabrice Di Meglio
eb072e125b
Tune Dashboard layouts following UX spec - part 2
...
- set a fixed size for the Dashboard icons (and thus fix the
Account type icons size isssue)
- tune layout for N7 tablet
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I0306f1ec2309e859e044e8490cef468def8d38fb
2014-06-05 17:36:45 -07:00
Alan Viverette
5e99218cab
am 0c004bbf
: Merge "Fix account header colors" into lmp-preview-dev
...
* commit '0c004bbf7c8c10347751f95cd07bb196cc07c877':
Fix account header colors
2014-06-05 22:23:12 +00:00
Alan Viverette
1d4b3122f1
am a83a532d
: Add defaults for caption colors and edge type, fix preview size
...
* commit 'a83a532dde44341319810958d67aabb02ff7aea6':
Add defaults for caption colors and edge type, fix preview size
2014-06-05 22:22:43 +00:00
Fabrice Di Meglio
d417a0ce5b
am bf088b5f
: Merge "Tune Dashboard layouts following UX spec" into lmp-preview-dev
...
* commit 'bf088b5f5d1dc9452ffc57d70c6591aa39371bc5':
Tune Dashboard layouts following UX spec
2014-06-05 22:22:43 +00:00
Alan Viverette
0c004bbf7c
Merge "Fix account header colors" into lmp-preview-dev
2014-06-05 22:18:45 +00:00
Alan Viverette
5031f14a4e
Fix account header colors
...
Temporary fix until we have a public Theme.Quantum.Settings in the
framework that we can attach to the inflation context.
Change-Id: Ifa89e31ad7928a6794a9cdd0fd96aaad3cb0bb64
2014-06-05 14:51:36 -07:00
Alan Viverette
a83a532dde
Add defaults for caption colors and edge type, fix preview size
...
BUG: 15116066
BUG: 8151470
Change-Id: Ieca00f0da209138bdfa691715720263ef5406773
2014-06-05 13:51:58 -07:00
John Spurlock
23efadfdd9
am 72d3c27d
: Settings: Notification string tweaks.
...
* commit '72d3c27d6aa7436244a23bad429644649f919ea8':
Settings: Notification string tweaks.
2014-06-05 20:19:13 +00:00
Fabrice Di Meglio
bf088b5f5d
Merge "Tune Dashboard layouts following UX spec" into lmp-preview-dev
2014-06-05 20:15:29 +00:00
Fabrice Di Meglio
c3febdf02f
Tune Dashboard layouts following UX spec
...
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I2554fa73ca293e10490982df58a42d293b48d311
2014-06-05 13:12:30 -07:00
Selim Cinek
67f2cd78f2
am 3b9f33b4
: Merge "Updated the colors of the lock pattern" into lmp-preview-dev
...
* commit '3b9f33b4b82bf2bb776ca917c29eb4b466d05888':
Updated the colors of the lock pattern
2014-06-05 16:14:09 +00:00
John Spurlock
72d3c27d6a
Settings: Notification string tweaks.
...
- Sounds & Notifications -> Sound & Notifications
- Notification station title -> Notification log
- Use dark theme for station to ensure icon is visible, boost
all text to theme's primary color.
Bug:15435289
Change-Id: I8a3b999a42ad4cb09e190bf887ae854f8a288d40
2014-06-05 12:04:02 -04:00
Selim Cinek
59db294f5f
Updated the colors of the lock pattern
...
Bug: 13735707
Change-Id: I6ca5f66e2fd5daa61e89b65ac2ccf6a3fddd5f7a
2014-06-05 07:22:16 +02: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
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
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
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
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