Commit Graph

1561 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Julia Reynolds
c92af83b0c Merge "Settings user restriction changes: wireless & networks changes." 2014-06-09 19:22:19 +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
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
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
Dianne Hackborn
1666d47fa2 am a4e854fa: Merge "Tweak battery usage to match red lines." into lmp-preview-dev
* commit 'a4e854fa5b9f5adc4898088f6d454dd92f4238a5':
  Tweak battery usage to match red lines.
2014-06-04 18:08:33 +00:00
Adrian Roos
f7c460d8d6 am 4e2104b1: Merge "Follow up to "A better brightness"" into lmp-preview-dev
* commit '4e2104b1191e5c3a049ebc159150fbb9a7bc2d03':
  Follow up to "A better brightness"
2014-06-04 18:08:32 +00:00
Alexandra Gherghina
820848a038 Merge "Move personal account settings to a new screen." 2014-06-04 07:48:14 +00:00
Alexandra Gherghina
ba63597d5a Move personal account settings to a new screen.
This does not include work account settings.

Bug: 13656853
Change-Id: I105044f8261b1c656ed5053b3c02c02cfaae90d1
2014-06-04 08:44:39 +01:00
John Spurlock
959dac4f16 am 2ca1a3f5: Settings: update bug report shortcut summary.
* commit '2ca1a3f5ff2dc013ddac920ca5a9eef161335df9':
  Settings: update bug report shortcut summary.
2014-06-03 17:15:41 +00:00
Dianne Hackborn
a4e854fa5b Merge "Tweak battery usage to match red lines." into lmp-preview-dev 2014-06-03 00:21:30 +00:00
Dianne Hackborn
7158e62992 Tweak battery usage to match red lines.
Most of this is done, the main thing missing is the color
of the bars which seems like a framework issue.

Note that this introduces a change to the global theme
making colorControlActivated the specified blue color,
which impacts all of the settings UI.  (Except apparently
progress bars, and thus the bug.)

Change-Id: I4a5ca8c3b94dc23b8f065f60fe697ee0e76ff47d
2014-06-02 17:21:13 -07:00
Adrian Roos
4e2104b119 Merge "Follow up to "A better brightness"" into lmp-preview-dev 2014-06-02 23:19:53 +00:00
Adrian Roos
8ab0954a24 Follow up to "A better brightness"
Original change I122e1218dd0072c979a59bdafd3e0b6f4eec99ab was missing
search provider logic adjustments and length limits on the added strings.

Bug: 15313133
Change-Id: I8910dd60111c87f5494db7bac76a351e89c1a99b
2014-06-03 00:00:11 +02:00
John Spurlock
2ca1a3f5ff Settings: update bug report shortcut summary.
Now mentions the power menu instead of Quick Settings.

Bug:15385554
Change-Id: I48c0625efc4589478e2866b3c7991cdb46e8204f
2014-06-02 15:24:07 -04:00
Fabrice Di Meglio
7d21de5186 am d4757e08: Merge "Fix bug #15330860 “More...” item in Settings should not have an icon" into lmp-preview-dev
* commit 'd4757e088b2f034e76b72840ccdb3fc5cd5f88c6':
  Fix bug #15330860 “More...” item in Settings should not have an icon
2014-05-30 02:48:13 +00:00
Fabrice Di Meglio
09786c529b Fix bug #15330860 “More...” item in Settings should not have an icon
- update the string to say "NFC & more"

Change-Id: Ic61e4a85cc6dfd6f32443656d9fb3ef5f9577a6e
2014-05-29 19:19:52 -07:00
Fabrice Di Meglio
bc9ad9b390 am c9a972ab: Merge "Fix bug #15330860 “More...” item in Settings should not have an icon" into lmp-preview-dev
* commit 'c9a972ab2a14b899412c8993f166dc70b8bcc955':
  Fix bug #15330860 “More...” item in Settings should not have an icon
2014-05-30 01:28:03 +00:00
Fabrice Di Meglio
aa66e80944 Fix bug #15330860 “More...” item in Settings should not have an icon
- actually the issue is that the string was containing an ellipsis
so remove it

Change-Id: I37f7db91fd86ba93d533d2a78c75813d2adbbc7e
2014-05-29 18:21:37 -07:00
Ido Ofir
b393848454 Merge "Moving the trust agents settings in the security settings menu and adding personal unlock." 2014-05-29 17:29:19 +00:00
Julia Reynolds
ee27b9de8f Settings user restriction changes: wireless & networks changes.
Bug: 14081992
Change-Id: I32b0f06da7e7ff9bd8303ce26be2584e6cddbedc
2014-05-29 13:21:29 -04:00
Alexandra Gherghina
ff0f1d8049 Merge "Adds missing accessibility string for accounts syncing" 2014-05-29 16:29:44 +00:00
John Spurlock
6926224f73 am 4e4cdeff: Settings: Remove sound settings.
* commit '4e4cdeffdb6087c953f44808f14f18554a749bda':
  Settings: Remove sound settings.
2014-05-28 20:52:56 +00:00
John Spurlock
4e4cdeffdb Settings: Remove sound settings.
- Move the remaining conditional preferences into
  the combined Sound & Notifications screen.
- Refactor the "Other sounds" sub-settings screen to
  provide a home for the new preferences.
- Migrate docking sounds, conditional on config.
- Migrate docking media, conditional on config.
- Migrate emergency tones, conditional on CDMA.
- Move all boilerplate preference <-> setting plumbing into
  a separate helper.
- Since some preferences in Other sounds are now conditional,
  create a special indexer for searching.
- Remove SoundSettings (and xml), create aliases in the manifest
  to avoid breaking shortcuts.

Bug:15279526
Change-Id: I5ae3ecda2f899b1948f7908bd217a799326c2c56
2014-05-28 16:37:43 -04:00
Ido Ofir
6f482447b0 Moving the trust agents settings in the security settings menu and adding
personal unlock.

Change-Id: I0eeb3a32c55450af2435112a98aa44475159dc4f
2014-05-28 13:36:11 -07:00
Alexandra Gherghina
a14cfda8fc Adds missing accessibility string for accounts syncing
Change-Id: If84fd05c67d2bddfbbc197a6f961c10409744462
2014-05-28 15:47:25 +01:00
John Spurlock
0d6b7183b5 am 66548844: Merge "Settings: Hide phone-related settings on tablets." into lmp-preview-dev
* commit '665488441761a0d6cae2498eff935de31a1a7f9f':
  Settings: Hide phone-related settings on tablets.
2014-05-27 19:26:04 +00:00
John Spurlock
57c713d1d9 Settings: Hide phone-related settings on tablets.
Bug:15002393
Bug:15091008
Change-Id: I8238b7990572f46e1530a800897ab2d39a189055
2014-05-27 14:39:02 -04:00
vandwalle
653cfeeb0a when vervbose logging, keep track of a list of ScanResults per AP
Change-Id: Ib8f797de360f11eb9914a6aa44d418e1d0571973
2014-05-22 15:03:48 -07:00
Jason Monk
0485b7c373 Add Editable PAC field to Proxy Configuration
Make PAC URL field not read only but now settable in advanced wifi
configuration options.

Bug: 14885470
Change-Id: I2c647f823d5c8a75b5fbf74434cbf0efcc4c50bf
2014-05-22 13:36:02 -04:00
vandwalle
c9a6698fd4 make verbose logging a wifimanager hidden API
Change-Id: I092b7f507ad4dfdab16658929f02584a1fc22ba4
2014-05-21 20:25:15 -07:00
Dianne Hackborn
7e315ee5e1 Merge "Update battery use chart to better match new mocks." 2014-05-21 21:26:24 +00:00
Dianne Hackborn
5a9ace3a7a Update battery use chart to better match new mocks.
Change-Id: I714cb30ccd9b8144785aee16a23ae2b723df4347
2014-05-21 14:19:11 -07:00
Alan Viverette
e1d7e03464 Fix typo in Settings
Change-Id: I343242def31448fa5697e21bec3b35ee55e22d13
2014-05-21 14:09:15 -07:00
Andres Morales
ad0c06aca3 Revert "Settings for NFC Unlock"
This will be rolled into a Trustlet

This reverts commit fd2b629335.

Change-Id: I921f0838d4646799b6664da64a578a209e9c037e
2014-05-20 16:59:25 +00:00
Paul Lawrence
f632ce1a92 Merge "Fixing decryption messaging" 2014-05-19 14:22:27 +00:00
John Spurlock
81bef1d745 VolumeZen: Sound & Notifications settings.
- Add sound settings under the newly combined Sound & Notifications
  top-level settings page.
- New slider preferences for setting audio stream volumes.
- Migrate checkbox prefs to switch prefs.
- New settings subpage for touch sounds.
- New settings subpage for "Showing notifications"
- New setting pref for displaying intercepted notifications in zen mode.
- New tri-state lockscreen notifications pref.
- Add priority + sensitivity options to app notification dialog.
- Remove badges on app notifications row, migrate to subtitle text.
- Migrate strings to common spot in strings.xml
- Remove heads up setting.
- Remove tweaks category (unused).
- Clean up notification settings, separate out into a code section per option.
- Clean up _settings.xml files, prefix each pref with option name.
- Add appropriate indexing data to each settings page.

Depends on f/b change Ic30aa575ae07650cee62c8c1d83b6bc69395cf0d

Change-Id: If700385a7d0057f6c4c4bcf6e648dcf88b8ebff2
2014-05-18 15:37:09 -04:00
Fabrice Di Meglio
0022a2a02d Fix categories title text
- should not be all caps any more

See bug #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I612de65539a02a65a7b760d53fb04290b6b596cf
2014-05-16 17:50:45 -07:00
Paul Lawrence
04425f1617 Fixing decryption messaging
Messaging currently implies encryption only works with PIN or password
(K functionality). Now that in L we support encryption with PIN, pattern,
password or swipe/none, we need to update the strings accordingly.

@bug 14257692
@bug 13674657

Change-Id: I055db1289c2c2750d217b50b653a7f36ff304aca
2014-05-16 09:22:49 -07:00
Martijn Coenen
00dbb74b8d HCE foreground support.
Allow users to configure they want to favor the foreground
app for tap&pay.
Change-Id: I25e1058e84f468e47fd40f43b65389c04373a3ab
2014-05-16 09:10:30 -07:00
Fabrice Di Meglio
8fb5d4a0ea Use SwitchBar for DoNoDisturb Settings
- follow up CL to 4193776698

Related to bug #14898161 On/Off switches must move down from Action Bar

Change-Id: If1ce0eb147ade8485107ee948b0d03cf688bcf06
2014-05-15 20:19:52 -07:00
Andres Morales
ae04155bbe Fix issues in Wi-Fi NFC tag code
An NPE + multiple comments

Change-Id: I04ffe10874cc2e9aa9f68bc551b8da98eb6f1640
2014-05-15 16:34:51 -07:00
Fabrice Di Meglio
0869526b81 Fix bug #14903618 Developer Options - string changes needed to the Bug report checkbox
- string update as follow:

LABEL

Current string:
- "Power menu bug reports"

Change to:
- "Bug report shortcut"

SECONDARY TEXT

Current string:
- "Include option in power menu for taking a bug report"

Change to:
- "Show a button in Quick Settings for taking a bug report"

Change-Id: Ibc716e1ae0bc3d553601908efd81babd66051d8b
2014-05-14 18:51:03 -07:00