Commit Graph

14411 Commits

Author SHA1 Message Date
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
Paul Lawrence
b15c68fbf1 Show time to go while encrypting drive
Bug: 15159008
Change-Id: I9bb6f86c2941cbd93572c25716d21691a4fefbef
2014-06-05 20:15:37 +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
Fabrice Di Meglio
77d1f1a412 am 5b01c0b3: Merge "Fix bug #15433763 "Sounds & Notifications" appears twice in the shortcut icon picker" into lmp-preview-dev
* commit '5b01c0b3ebf18a22b8ecbe0e09ff39807e574040':
  Fix bug #15433763 "Sounds & Notifications" appears twice in the shortcut icon picker
2014-06-05 09:47:53 +00:00
Selim Cinek
3b9f33b4b8 Merge "Updated the colors of the lock pattern" into lmp-preview-dev 2014-06-05 05:23:29 +00:00
Selim Cinek
59db294f5f Updated the colors of the lock pattern
Bug: 13735707
Change-Id: I6ca5f66e2fd5daa61e89b65ac2ccf6a3fddd5f7a
2014-06-05 07:22:16 +02:00
Jean Chalard
2d444968a5 Merge "Allow multiple shortcuts for a personal dictionary word" 2014-06-05 04:10:01 +00:00
Russell Brenner
38583c7328 Merge "Don't advance when recreating from bundle" 2014-06-05 03:38:57 +00:00
Fabrice Di Meglio
7eceb9369d am 35a2c0d6: Merge "Fix bug #15434475 Developer Options do not show immediately after activating them" into lmp-preview-dev
* commit '35a2c0d6381181082b8723f38a8f606dbca1d674':
  Fix bug #15434475 Developer Options do not show immediately after activating them
2014-06-05 01:46:01 +00:00
Fabrice Di Meglio
5b01c0b3eb Merge "Fix bug #15433763 "Sounds & Notifications" appears twice in the shortcut icon picker" into lmp-preview-dev 2014-06-05 01:43:43 +00:00
Fabrice Di Meglio
61cab31a9e Fix bug #15433763 "Sounds & Notifications" appears twice in the shortcut icon picker
- remove shortcut for the alias created for compatibility

Change-Id: Ic5b6f354143951a1d3688e5eb9b994066f425a2a
2014-06-04 18:41:14 -07:00
Adrian Roos
5758c83449 am fe8572a0: (-s ours) Merge "Ensure trust agents are only provided by platform packages - DO NOT MERGE" into lmp-preview-dev
* commit 'fe8572a056fe02fbb384c47d0de617f9a350ebf6':
  Ensure trust agents are only provided by platform packages - DO NOT MERGE
2014-06-05 00:45:13 +00:00
Fabrice Di Meglio
35a2c0d638 Merge "Fix bug #15434475 Developer Options do not show immediately after activating them" into lmp-preview-dev 2014-06-05 00:42:08 +00:00
Fabrice Di Meglio
bb05178dba Fix bug #15434475 Developer Options do not show immediately after activating them
- allow Dashboard categories reloading

Change-Id: I02d9f1e8ed4d8b8b670835a8d717c6c08b49fe05
2014-06-04 17:33:25 -07:00
Russell Brenner
c56c8c99e9 Don't advance when recreating from bundle
The fragment is recreated from a bundle when returning from finished
activities, like the OTA and walled garden checks. Telling
WizardManager to advance to the next screen causes a duplicate
activity because WizardManager has already responded to the other
finished activity.

Bug: 15393012
Change-Id: I9817e106a0b243b3943bff6edafc228e9e002232
2014-06-04 17:32:22 -07:00
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