Commit Graph

6054 Commits

Author SHA1 Message Date
Julia Reynolds
2c53933e8d Use user restriction instead of pin to guard factory reset in Settings.
Bug: 14081992
Change-Id: I60f132312368c5097b46ab97e881eec3700ef586
2014-06-13 13:10:44 -04:00
Julia Reynolds
253b111a3d Merge "Remove PIN from users page - use disallow_add/remove_user restrictions." 2014-06-10 21:38:43 +00:00
Dianne Hackborn
ff0a8a2f43 am 2f2cbbc7: Merge "Small fixes to power save UI." into lmp-preview-dev
* commit '2f2cbbc760c23d89c5b0255378bbf5cb074a6988':
  Small fixes to power save UI.
2014-06-12 00:03:50 +00:00
Fabrice Di Meglio
e306098cab am 782d0f68: Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev
* commit '782d0f689106aed05de80e93948f9e7b30701601':
  Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels
2014-06-12 00:03:34 +00:00
vandwalle
4e278c7c62 Merge "remove disbaled for unknown reason status" 2014-06-11 21:23:31 +00:00
Julia Reynolds
b9195d25ee Remove PIN from users page - use disallow_add/remove_user restrictions.
Bug: 14081992
Change-Id: If4973d64ae54da602a2682dee5b868ff66273856
2014-06-11 17:14:14 -04:00
vandwalle
d42ec37dbf remove disbaled for unknown reason status
Change-Id: Id9fda1b6aeec8e7122a5c00996e5afbec20ac1cb
2014-06-10 20:47:19 -07:00
Dianne Hackborn
2f2cbbc760 Merge "Small fixes to power save UI." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Dianne Hackborn
de159c8d16 Small fixes to power save UI.
Use the correct default setting, and don't crash.

Change-Id: I33fd612aba404e13c8bbe9110535dff1cfba12a4
2014-06-10 23:17:01 -07:00
Fabrice Di Meglio
782d0f6891 Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Fabrice Di Meglio
a7a62c5b66 Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels
- use DateFormat.getBestDateTimePattern(...) to get the best Date and Time format
depending on the Locale
- format the label according to the best format
- remove non needed formatting strings

Change-Id: I78b62b9a7c9401e47e62c7161214636bb43324fc
2014-06-10 20:26:42 -07:00
Fabrice Di Meglio
da8babaedf Update Settings redlines per UX request
See bug: #15384992 Setting Dashboard - padding updates

Change-Id: Ie95b6cee701847d7f76f2e2a72aaf8fc64bc4dd9
2014-06-10 19:36:26 -07:00
Fabrice Di Meglio
1c3203e83e Merge "Update Settings redlines per UX request" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Jay Civelli
8662a22c99 Merge "Temporary removing the Trust Agent permission change." 2014-06-10 21:49:59 +00:00
Fabrice Di Meglio
87f06fa594 am 1c3203e8: Merge "Update Settings redlines per UX request" into lmp-preview-dev
* commit '1c3203e83efed2d5c257da8e4f5fba4844b6fa47':
  Update Settings redlines per UX request
2014-06-11 17:43:44 +00:00
John Spurlock
69323ad96a am e9ee5e2c: Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev
* commit 'e9ee5e2cede8d7e8fd7791113903df7eff1ec75a':
  Settings: Battery saver settings sub-page.
2014-06-11 17:02:20 +00:00
Jay Civelli
382a9b9780 Temporary removing the Trust Agent permission change.
Removing the permission check for Trust Agents, until the GMS core prebuilt
has that permission.

BUG: 15546358

Change-Id: Ie0a68fcc313b835a8f5e87570fd248612c837bd3
2014-06-11 09:17:46 -07:00
Alan Viverette
2c461006b8 am 6bfec2d6: Remove all dialog icons in Settings
* commit '6bfec2d6b197068dd355bd1742179fe3da07136f':
  Remove all dialog icons in Settings
2014-06-11 13:07:58 +00:00
John Spurlock
e9ee5e2ced Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev 2014-06-10 21:36:19 +00: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