John Spurlock
2bd9eeded4
am 5fe76205
: Settings: Workaround duplicate onActivityCreate
...
* commit '5fe76205b607f193b5925eccfabddc145118b5ea':
Settings: Workaround duplicate onActivityCreate
2014-06-12 20:06:10 +00:00
Dianne Hackborn
3b2be31687
am 9f789fbe
: Merge "I am a Material girl, living in a Material world." into lmp-preview-dev
...
* commit '9f789fbe082792f57dde72e6c5a501cd0441cd6f':
I am a Material girl, living in a Material world.
2014-06-12 18:48:57 +00:00
John Spurlock
a6f8f8b3d9
am 26ac83df
: Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev
...
* commit '26ac83df5922430b7d7e3eee46c36c7d856bc47c':
Settings: Remove master swtich from battery saver.
2014-06-12 18:37:34 +00:00
Vinit Deshpande
63328dedb4
am c8e2eeea
: Fix icon location on Wifi Settings
...
* commit 'c8e2eeeaa1666d37abc16d0505a1ef6e9a5bae91':
Fix icon location on Wifi Settings
2014-06-12 18:37:22 +00:00
John Spurlock
5fe76205b6
Settings: Workaround duplicate onActivityCreate
...
Bug: 13329308
Change-Id: Ia6b8cf766d517b4e8e5689e33cbb52299471407b
2014-06-12 15:42:12 +00:00
Fabrice Di Meglio
f9360dbcef
Merge "Make the SwitchBar appear immediately" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Fabrice Di Meglio
138ff8c045
Make the SwitchBar appear immediately
...
- change the way the SwitchBar is shown and hidden
- save its state
- remove the delay transition code
Change-Id: I07260430e6709b42517ca011f6d3c3446a626731
2014-06-12 11:13:23 -07:00
Vinit Deshpande
c8e2eeeaa1
Fix icon location on Wifi Settings
...
Wifi icons are showing up on the right of the name; which is unlike
other settings; this change fixes that.
Wifi settings are using standard preference layout; so moving to the
new location requires setting different property (icon instead of widget)
on the preference fragment.
Bug: 15117166
Change-Id: I5dd0a843139512d16fb70dd99ed12c3584f57895
2014-06-11 21:22:04 +00:00
Dianne Hackborn
9f789fbe08
Merge "I am a Material girl, living in a Material world." into lmp-preview-dev
2014-06-10 22:12:51 +00:00
Dianne Hackborn
3bd46a70c1
I am a Material girl, living in a Material world.
...
Change-Id: I3206041666a3236fdeb5f5897e6d8767137c2b85
2014-06-11 16:27:22 -07:00
Robert Greenwalt
746c6ae949
Merge "Apply LinkProperties changes." into lmp-preview-dev
2014-06-10 22:12:51 +00:00
Robert Greenwalt
a0ac614c08
Apply LinkProperties changes.
...
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
(cherry picked from commit 51d898fd02
)
2014-06-10 22:42:12 +00:00
John Spurlock
26ac83df59
Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev
2014-06-10 21:38:43 +00:00
John Spurlock
5845d98a8a
Settings: Remove master swtich from battery saver.
...
And make it a normal switch called "Always on". Better reflects
the actual effect.
Change-Id: I9f801ddfff39591cb19d665f61a1a05bda317888
2014-06-11 18:44:24 -04:00
John Spurlock
c7f8e8ce69
Settings: Battery saver settings sub-page.
...
New battery saver settings page, accessed via
the power usage settings overflow menu.
The settings page has a master switch to toggle
battery saver mode, feature disclosure text,
and a preference to configure the automatic
trigger level.
Remove developer checkbox now that this option
has a real home.
NO_SQ: multi project change
Bug:13329308
Change-Id: Iac54238f3406439711b44a3c17f220ac5e370a37
2014-06-10 17:26:47 -04:00
Alan Viverette
6bfec2d6b1
Remove all dialog icons in Settings
...
BUG: 15474733
Change-Id: I43ab10a3bbcabdac6109abf80266f1c4b52bf6fb
2014-06-10 13:41:07 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
Paul Lawrence
b15c68fbf1
Show time to go while encrypting drive
...
Bug: 15159008
Change-Id: I9bb6f86c2941cbd93572c25716d21691a4fefbef
2014-06-05 20:15:37 +00:00
Jean Chalard
2d444968a5
Merge "Allow multiple shortcuts for a personal dictionary word"
2014-06-05 04:10:01 +00:00