Commit Graph

13909 Commits

Author SHA1 Message Date
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
Adrian Roos
758467f7eb Merge "Fix master build" 2014-06-10 15:16:57 +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
Adrian Roos
07d036a5b2 Fix master build
Change-Id: Iaad9a63c5971b506cf8052aba48364979ec69c78
2014-06-10 16:48:07 +02: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
9311b08831 am 9f72756f: Merge "Fix bug #14499324 Label of the "Language & input " page doesn\'t get updated ...as per the newly selected language" into lmp-preview-dev
* commit '9f72756f11647aa2bd4fae2a98a40ccc6e30348c':
  Fix bug #14499324 Label of the "Language & input " page doesn't get updated ...as per the newly selected language
2014-06-10 11:17:49 +00:00
Fabrice Di Meglio
a13e40f4ce Merge "Add icon for Search Recents" into lmp-preview-dev 2014-06-10 00:54:04 +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
66220ba849 Merge "Tune Recents Search and Search Results" into lmp-preview-dev 2014-06-10 00:10:17 +00: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
vandwalle
7d7c0db55d Merge "reporting correct per ssid status" 2014-06-09 22:30:46 +00:00
vandwalle
3acbfdc615 reporting correct per ssid status
Change-Id: Ifac67c95883961df75c2be16b12710284c508228
2014-06-09 14:56:51 -07:00
Fabrice Di Meglio
310d74fa2b Merge "New Battery Material assets" into lmp-preview-dev 2014-06-09 20:49:02 +00: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
ef40c0083b Merge "New Sync Status Material assets" into lmp-preview-dev 2014-06-09 20:27:26 +00: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
Fabrice Di Meglio
9f72756f11 Merge "Fix bug #14499324 Label of the "Language & input " page doesn't get updated ...as per the newly selected language" into lmp-preview-dev 2014-06-09 20:05:06 +00:00
Fabrice Di Meglio
a9e77993d1 Fix bug #14499324 Label of the "Language & input " page doesn't get updated
...as per the newly selected language

- use also title resource id when possible

Change-Id: Ibeb95d605cd79910c18f4529b749645c9ed0fc17
2014-06-09 13:01:39 -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
Dan Sandler
6dfb7ce221 am 8b9fb64d: Merge "Hide aspirational notifications UI." into lmp-preview-dev
* commit '8b9fb64d7f7d9cc37e7dd7f9fa4fd805edfbbc3c':
  Hide aspirational notifications UI.
2014-06-09 19:29:12 +00:00
Fabrice Di Meglio
33bb3991c3 am eae845c4: Merge "Fix DisplaySettings indexing for Search" into lmp-preview-dev
* commit 'eae845c42bfe70ee28d394e2a8b90969e8e1bf8c':
  Fix DisplaySettings indexing for Search
2014-06-09 19:29:11 +00:00
Daniel Sandler
ac576ea145 am 16c276a1: Follow API change.
* commit '16c276a1ff84a1bcae18ca724a1c1da504e03c5b':
  Follow API change.
2014-06-09 19:29:03 +00:00
Julia Reynolds
c92af83b0c Merge "Settings user restriction changes: wireless & networks changes." 2014-06-09 19:22:19 +00:00
Dan Sandler
8b9fb64d7f Merge "Hide aspirational notifications UI." into lmp-preview-dev 2014-06-09 17:43:04 +00:00
Dan Sandler
90f8035ea5 Hide aspirational notifications UI.
Once those features are implemented we'll wire the boxes up.

Bug: 15080030
Change-Id: Ic0f0e6f411df2ae4733bce8e5328fb2c5b16ddaf
2014-06-09 13:21:55 -04:00
Fabrice Di Meglio
eae845c42b Merge "Fix DisplaySettings indexing for Search" into lmp-preview-dev 2014-06-09 17:17:25 +00:00
Fabrice Di Meglio
d407f2a05c Fix DisplaySettings indexing for Search
- was missing the KEY_SCREEN_SAVER case as this Preference
can be removed

See bug: #12910134 Implement Search into the Settings App

Change-Id: I6c6fde41d0208a2e87e7fb1239c0909e034e5b0d
2014-06-09 10:13:43 -07:00
Daniel Sandler
16c276a1ff Follow API change.
Depends on change Icbc09bfc in f/b.

Bug: 15022240
Change-Id: Icbc09bfc5ce78964272def66934fe4a7c848e12b
2014-06-09 16:53:02 +00:00
Robert Greenwalt
51d898fd02 Apply LinkProperties changes.
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
2014-06-08 08:58:42 -07: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
c6dacf5e56 am c9548c17: Merge "Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present" into lmp-preview-dev
* commit 'c9548c17471ff7d7826a769593250ca3467a2ba5':
  Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present
2014-06-07 10:01:14 +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
Fabrice Di Meglio
c9548c1747 Merge "Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present" into lmp-preview-dev 2014-06-06 23:38:11 +00:00
Fabrice Di Meglio
dba577f8f0 Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present
- implement a BaseSearchIndexProvider for WirelessSettings
- fix Context passed to the Index: now use an ApplicationContext
- also use the correct Context when dealing with Settings SearchIndexProvider
- also makes impossible a rogue BaseSearchIndexProvider to crash Settings
if not well behaving
- last, fix icon used for "NFC & more" search results

Change-Id: I8b5cc999fa57a9e1977ee57394801d54cf3dbabb
2014-06-06 16:35:41 -07:00
Alan Viverette
08a7d554b0 Merge "Material theme" 2014-06-06 22:49:59 +00:00
Alan Viverette
80814f5314 Material theme
BUG; 15467097
Change-Id: Ifeda3f6cc1554c4d31357d5010df6958113df964
2014-06-06 15:27:32 -07:00
Amith Yamasani
34766441f7 am fd1710bf: Merge "Show user management UI if a managed profile exists" into lmp-preview-dev
* commit 'fd1710bf9e163962ecbbe97e4663978230818a7f':
  Show user management UI if a managed profile exists
2014-06-06 22:08:30 +00:00
Amith Yamasani
fd1710bf9e Merge "Show user management UI if a managed profile exists" into lmp-preview-dev 2014-06-06 22:03:36 +00:00
Alan Viverette
763790ec9c am 5c8f1352: (-s ours) DO NOT MERGE Material theme
* commit '5c8f1352e4762d49184112a948628fed32f4639a':
  DO NOT MERGE Material theme
2014-06-06 21:59:59 +00:00
Alan Viverette
5c8f1352e4 DO NOT MERGE Material theme
BUG; 15467097
Change-Id: Ifeda3f6cc1554c4d31357d5010df6958113df964
2014-06-06 14:33:10 -07:00
Amith Yamasani
4093e40e18 Show user management UI if a managed profile exists
Show UI even if flags to show multiuser UI are off, if there's a
second user on the device. This way there's an affordance to remove
the user.

Don't show the "Add user" item though.

Bug: 15447068
Change-Id: I40273005d6d8d66aed486328615acdab71d51fa4
2014-06-06 14:31:37 -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
c56acc5f3c am 3d35ec72: Fix bug #15469483 Search menu should not be present when Settings is launched as a Shortcut
* commit '3d35ec729256d4a1e1796be3e9d858eefedda23d':
  Fix bug #15469483 Search menu should not be present when Settings is launched as a Shortcut
2014-06-06 20:57:22 +00:00
e12b2f047a Merge "Update the settings due to a framework API change." 2014-06-06 20:37:20 +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
3d35ec7292 Fix bug #15469483 Search menu should not be present when Settings is launched as a Shortcut
- create the Search menu only for non shortcut launch

Change-Id: I8f83fb6c199509f2b2215a20b19f92e3d736b733
2014-06-06 12:13:29 -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