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
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
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