Commit Graph

4717 Commits

Author SHA1 Message Date
Martijn Coenen
50ee528fd8 Merge "Remove obsolete NFC unlock XML file." 2014-06-10 20:56:05 +00:00
Martijn Coenen
54a10a0a97 Remove obsolete NFC unlock XML file.
NFC unlock was moved to TrustAgent.

Change-Id: Iaf7f96a38ee36b80168cd92eef0d3b9748caa478
2014-06-10 13:54:39 -07:00
Alan Viverette
a29f3bbff4 Merge "Ripple tint is now color" into lmp-preview-dev 2014-06-10 20:14:40 +00:00
Baligh Uddin
bb8830756f Merge "Breaks the build. Issue being tracked in b/15538481" into lmp-preview-dev 2014-06-10 19:49:12 +00:00
Baligh Uddin
279359957f Breaks the build.
Issue being tracked in b/15538481

Revert "Import translations. DO NOT MERGE"

This reverts commit b9e06ceb16.

Change-Id: I9161a3290a8488d0d896d6dbb41d367317694269
2014-06-10 19:49:04 +00:00
Fabrice Di Meglio
df055ead66 Merge "Replace ic_settings_language.png asset to the new one" into lmp-preview-dev 2014-06-10 19:12:54 +00:00
Fabrice Di Meglio
65b145e6d5 Replace ic_settings_language.png asset to the new one
See bug: 15523731 Please replace ic_settings_language.png to new one

Change-Id: I1455396ba91f3d519dd42df5b6ea2095ec20f42f
2014-06-10 12:10:42 -07:00
Baligh Uddin
cc076fe330 Merge "Fix Build break, will address in parallel." 2014-06-10 18:02:20 +00:00
Baligh Uddin
cf9185c75b Fix Build break, will address in parallel.
Revert "Import translations. DO NOT MERGE"

This reverts commit b2ceea95f2.

Change-Id: Ie92030c9c3bdde0b7dffd1382e2393126688ce4e
2014-06-10 18:02:13 +00:00
Fabrice Di Meglio
1e745264fa am 2eae7a40: Merge "Update Sync status icon" into lmp-preview-dev
* commit '2eae7a40229b132bed632df0879e4056a7c5a107':
  Update Sync status icon
2014-06-10 17:22:14 +00:00
Fabrice Di Meglio
009c2f20de am f54b6031: Merge "Update assets for "NFC & more"" into lmp-preview-dev
* commit 'f54b603156c042031af74e3ad73b55b75f058a09':
  Update assets for "NFC & more"
2014-06-10 17:22:02 +00:00
Fabrice Di Meglio
dbc851ad81 am 195ee660: Merge "Update Recents Search assets" into lmp-preview-dev
* commit '195ee66013b990f8da06a030fb4889e50d1eeacf':
  Update Recents Search assets
2014-06-10 17:21:54 +00:00
Fabrice Di Meglio
0f3ab8b4b7 am a13e40f4: Merge "Add icon for Search Recents" into lmp-preview-dev
* commit 'a13e40f4ce6c9435ba4d014319c371bfa96f252e':
  Add icon for Search Recents
2014-06-10 17:21:34 +00:00
Baligh Uddin
fa89b8e0dd Merge "Import translations. DO NOT MERGE" 2014-06-10 17:11:23 +00:00
Baligh Uddin
eff52addfc Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-10 17:11:19 +00:00
Fabrice Di Meglio
1e2ac9efd3 am 66220ba8: Merge "Tune Recents Search and Search Results" into lmp-preview-dev
* commit '66220ba8491bd479f859fcb054268b7aedef93ef':
  Tune Recents Search and Search Results
2014-06-10 14:55:41 +00:00
Fabrice Di Meglio
ffdf3dc826 am 310d74fa: Merge "New Battery Material assets" into lmp-preview-dev
* commit '310d74fa2bd1d9898c327b032eb244b005143b9d':
  New Battery Material assets
2014-06-10 11:17:58 +00:00
Fabrice Di Meglio
c35394faad am ef40c008: Merge "New Sync Status Material assets" into lmp-preview-dev
* commit 'ef40c0083b1791704cfd23d97a2775fe74a5ef7b':
  New Sync Status Material assets
2014-06-10 11:17:57 +00:00
Fabrice Di Meglio
e03ebf988d Update Sync status icon
- per UX request

Change-Id: I3629f64e294b25882570db914b4e72b5fc352039
See: #15351850 Need updated Quantum icons for Sync Status
2014-06-09 19:19:13 -07:00
Fabrice Di Meglio
ae0b529d67 Update assets for "NFC & more"
- per UX request

See bug: # 15450825 Dashboard "NFC & more" icon is not the correct size

Change-Id: I85573d221da7622d7cf8de253631c54b92723c4f
2014-06-09 18:53:29 -07:00
Fabrice Di Meglio
009e8d24da Update Recents Search assets
- 20% grey per UX request

See bug: #12910134 Implement Search into the Settings App

Change-Id: I6c6e506a2f371b95c5c953615a41143e913e855b
2014-06-09 18:37:10 -07:00
Alan Viverette
296c7f575e Ripple tint is now color
Change-Id: I8e7d514fef327a7d3e172d0faae2466d26bddb9d
2014-06-10 00:58:45 +00:00
Fabrice Di Meglio
904a744c15 Add icon for Search Recents
- per UX request

See bug: #12910134 Implement Search into the Settings App

Change-Id: I91082292fd6a84f503b61b19d1a74bd89da8e209
2014-06-09 17:52:32 -07:00
Fabrice Di Meglio
04cde98538 Tune Recents Search and Search Results
- add the capability to scroll recents and results with their
header (old request from UX)

See bug: #12910134 Implement Search into the Settings App

Change-Id: If3c4a23b928b189803f2ef8e13a61746c2790b4b
2014-06-09 17:07:04 -07:00
Fabrice Di Meglio
60c26572d1 New Battery Material assets
See bug: #15330969 Settings > Battery should use Quantum icons for as many items as possible

Change-Id: I79bce984982b44e1906de0d85ee5743bd93abece
2014-06-09 13:46:14 -07:00
Fabrice Di Meglio
67d91f33a4 New Sync Status Material assets
See bug: #15351850 Need updated Quantum icons for Sync Status

Change-Id: Ic0bd083c2c4bb1c6ba844bb7299854d1efe4461f
2014-06-09 13:25:06 -07:00
Baligh Uddin
b2ceea95f2 Import translations. DO NOT MERGE
Change-Id: I407447b3a08d9c5c0da13b8513fad3439e89fdaf
Auto-generated-cl: translation import
2014-06-09 12:32:00 -07:00
Baligh Uddin
b9e06ceb16 Import translations. DO NOT MERGE
Change-Id: Ifc4e7d159e4ade3ea8c09d9147bcf8e064538c48
Auto-generated-cl: translation import
2014-06-09 12:27:33 -07:00
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