Commit Graph

1659 Commits

Author SHA1 Message Date
Felipe Leme
bc64d5030e Merge "Displays frequency on connected WiFi network info. Bug: 12767819" 2014-03-14 22:42:05 +00:00
David Braun
99fb0e9e59 am 177c876f: am ca95017f: am c0737638: am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
* commit '177c876fed5511dadc02544040dcdfa24435d1b6':
  Add string parameter order to default SMS dialog text
2014-03-14 17:54:13 +00:00
David Braun
c07376380f am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
* commit '63ac6a06efd39078b3fc066896fc7ea003ab34ce':
  Add string parameter order to default SMS dialog text
2014-03-14 16:28:00 +00:00
David Braun
edcb923df6 Add string parameter order to default SMS dialog text
Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
2014-03-13 11:20:48 -07:00
Dianne Hackborn
17452d5238 Bat stats: misc, percents are of battery drain.
Change-Id: I6f1fb6ff33f524fe76d519a6194fad67559193bd
2014-03-13 09:51:19 -07:00
Alan Viverette
429720754d am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
2014-03-13 10:01:45 +00:00
Dan Sandler
347f944a22 Finally, a place for notification settings.
Consolidated under the new Notifications settings are:

  - Ringtone (from Sound)
  - Zen Mode (from Sound)
  - Pulse LED (from Display)
  - Heads-Up Notifications (from Display)
  - Notification Access (from Security)
  - Show when locked (from Security)

Change-Id: I214d03ba1e356e088323a3058d98d390b8a8f988
2014-03-12 14:15:09 -04:00
Felipe Leme
f8d798631b Displays frequency on connected WiFi network info.
Bug: 12767819

Change-Id: Ia71b28b1dd77bdabc53a3e91bd54375bdaebfe4a
2014-03-12 10:50:12 -07:00
Alan Viverette
8840aa4c40 Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 2014-03-11 02:11:52 +00:00
Alan Viverette
00f221dc9e DO NOT MERGE Add preference for caption text opacity
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2014-03-07 14:06:29 -08:00
Wei Wang
1a188f4075 DO NOT MERGE Change bluetooth off display message.
Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
2014-03-06 18:45:35 +00:00
Wei Wang
d952fb07fd Change bluetooth off display message.
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
2014-03-03 17:43:19 -08:00
Tom O'Neill
e690fe8999 Merge "Remove unused string" 2014-03-03 23:24:57 +00:00
Fabrice Di Meglio
6f0739a3d9 Add Search to the Settings App (initial release)
- add basic UI for search
- build the search Index thru sqlite FTS4 (faster than FTS3)
- create the search Index on the fly depending on the locale
- re-index if there is a configuration change
- re-index too if the Android build version has changed (usefull
for an Android OTA or when a new Android version is pushed as
we need to recompute the Index)
- search thru "title" and "summary" Preference's data
- group results in the same order of the Settings categories
into the Drawer
- rewrite "title" and/or "summary" if they are containing
an hyphen "\u2011"
- add Preference Keywords (only for the Settings App) in the
Index and allow search on them (Wi-Fi network preference is
used as an example)

Known restrictions:

- we cannot yet search for "dynamic settings"
- ... nor we cannot search for settings coming from an external App
(like the Phone App and its related settings that are surfacing
into the Settings App).
- will need a few other CLs to add more keywords (and have them translated)

Change-Id: I017a4d6c433f28c257c08cacc1bed98c4c517039
2014-03-03 14:46:17 -08:00
Tom O'Neill
d76d707ebd Remove unused string
- Usage removed in
https://googleplex-android-review.googlesource.com/427312

- Bug: 13279850

Change-Id: I3c10d5e15a208b877bd0ef4627eb5cf2f2b61fa6
2014-03-03 13:16:53 -08:00
Wei Wang
17d2124c1c Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87
2014-03-03 11:18:21 -08:00
Chris Wren
f7890677df Merge "add a setting for the heads up: app part" 2014-03-01 00:06:55 +00:00
John Spurlock
5ae9ef25c6 Merge "Zen mode configuration panel. (packages/apps/Settings)" 2014-02-28 23:04:29 +00:00
John Spurlock
7243806345 Zen mode configuration panel. (packages/apps/Settings)
Read-only version of the configuration screen for
Limited Interruptions.  Defaults to the logic implemented
for this mode, namely block notifications except for
Calls & Alarms.

This settings panel will serve as a target for the
configure affordance in SystemUI.

Change-Id: I33fd1e11ab76dbb7044bb94cb096cd892945947d
2014-02-28 17:44:40 -05:00
Chris Wren
ad1b7eb398 add a setting for the heads up: app part
Bug: 13208692
Depends-On: I6847f7a5f275aee2f608de0237dab0e45c39b33f
Change-Id: Ia410a473492aa7637449ba5a5dc068f98618ad03
2014-02-28 17:19:00 -05:00
rich cannings
9f1014a772 Legal and strings approved verify apps summary
Change-Id: Iec9dd6ec7eb4b90862021fc870235848723a2e31
2014-02-28 09:56:53 -08:00
Dianne Hackborn
0f9ab45376 Merge "Show new radio active times." 2014-02-28 02:03:16 +00:00
John Spurlock
adda1b0022 Zen mode settings.
Step 1: Surface zen mode value under sound settings.

This is in keeping with the principle that quick settings are
accelerators (not replacements) for settings in the Settings app.

Adding configuration to "Limited interruptions" will be done as
a followup, and will serve as the target for the configuration
icon in SystemUI.

Change-Id: Ia2c7351454b17df3e27926ff593eebff284ebef8
2014-02-27 15:43:40 -05:00
Dianne Hackborn
3c741d2be8 Show new radio active times.
Change-Id: Id3b2d072df87dce5312a1e7b7d6a0012a1b5b19a
2014-02-26 15:53:47 -08:00
Fabrice Di Meglio
167f82de3a Merge "Fix bug #13140648 Settings needs to support the new Quantum Paper theme" 2014-02-25 22:31:06 +00:00
Fabrice Di Meglio
0e2f949c90 Fix bug #13140648 Settings needs to support the new Quantum Paper theme
Second pass:

- use Theme Holo for the Drawer too
- add a temporary background for Drawer icons (so that they dont mix
with the Drawer background)
- remove the "More..." icon as it was not needed

This CL will show that there is a discrepancy into the Drawer icons
size (some are smaller than the standard size, some other bigger).

This issue will be fixed when the new set of Icons will be delivered
by the UX team.

Change-Id: I431882df9b98157e98a1b735f31d9e77ef846767
2014-02-25 14:26:27 -08:00
Dianne Hackborn
9050c57707 Merge "Rename unaccounted to unknown." 2014-02-25 19:08:09 +00:00
Fabrice Di Meglio
a90ecd775e Merge "Implement Holo Light Theme for Settings" 2014-02-25 17:53:05 +00:00
Dianne Hackborn
8969f615f8 Rename unaccounted to unknown.
Change-Id: I8071c3046c69a5f513cfbec12bc0b8628194b30d
2014-02-24 18:16:12 -08:00
Fabrice Di Meglio
dca2806a23 Implement Holo Light Theme for Settings
... and use Holo (Dark) Theme for the Drawer as requested by UX

Also remove the Wi-Fi and Bluetooth switches in the Drawer per
following UX specification.

Change-Id: I4fc17481255b5db337a887033bc831ded0d2d701
2014-02-24 13:03:32 -08:00
Dan Sandler
91d014a965 Settings>Security>Show notifications (on the lockscreen).
Allows the user to toggle
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
which if set shows the complete private contents of that
user's notifications atop a securely locked screen. When
unset, only the "public" versions of notifications are shown
(which may include explicit redactions made by the app).
See f/b change I32bb7939 for details.

This checkbox is hidden for insecure keyguards ("off" and
"none"). It is also unavailable if
Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS is not set
(see f/b change I9c517949.)

Change-Id: Ie1b4c6b949b597b97e536d8ea7e35c9de9b6995f
2014-02-24 01:28:49 +00:00
rich cannings
4ecd8d4d9a Update verify apps summary string
Bug: 12836511
Change-Id: I7c198efc03b403f2dfede47648487875bc9b2f82
2014-02-18 16:47:50 -08:00
rich cannings
13ae78a5a7 Update verify apps summary string
Bug: 12836511
Change-Id: Ibce824bcef3e3c9a3f9ea69ed4b8425663bbdb12
2014-02-18 14:00:50 -08:00
John Reck
1b7bf5eaae Merge "Remove overdraw count option" 2014-02-06 18:49:09 +00:00
John Reck
a097c22662 Remove overdraw count option
Change-Id: Ia9f794d5817b7dd7a193864575d120d004cb552e
2014-02-05 16:48:21 -08:00
Fabrice Di Meglio
263bcc8b73 Use Drawer in Settings app
- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header  validation when launched from the Drawer but *force* validation if external
call thru an Intent

Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).

Also, verified that:

- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer

Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
2014-02-03 16:36:46 -08:00
Wei Wang
aa6e665a02 Fix misspell of "otherdevices"
Bug: 12569650

Change-Id: I2c75ddfed22ded6a15291956c0c167acf6d67b0b
2014-01-16 22:13:38 +00:00
Wei Wang
ab4029665b Merge commit 'f4f8d9f3' into manualmerge
Conflicts:
	res/values/strings.xml

Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
2014-01-14 23:42:41 -08:00
Wei Wang
eeb60f9473 Merge commit 'fc8d2556' into manualmerge
Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
2014-01-14 22:33:21 -08:00
Wei Wang
f4f8d9f346 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-14 18:06:42 -08:00
Wei Wang
fc8d255671 Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
2014-01-14 18:06:32 -08:00
Wei Wang
c0af0c4633 Merge "BLE peripheral mode (4/4): Settings change for advertising preference." 2014-01-15 01:43:37 +00:00
Wei Wang
eb56b9ccb8 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-13 17:41:02 -08:00
Dianne Hackborn
5b6f59a072 Add "unaccounted" item to battery use UI.
Kind-of informative.

Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
2014-01-13 17:40:50 -08:00
Alan Viverette
dd6513d969 Merge "Additional captioning fonts" 2013-12-20 00:41:02 +00:00
Alan Viverette
7f9781b559 Merge "Additional caption settings for edge styles and window color" 2013-12-20 00:40:53 +00:00
Dianne Hackborn
fb03058dc9 Update to follow BatteryStats.
Change data use to be based on packets instead of bytes.

Change-Id: I536dd2c2fc3fbeb12689e793f79e5fac984fe3af
2013-12-19 13:10:25 -08:00
Alan Viverette
d07c16107d Additional caption settings for edge styles and window color
Change-Id: Ib967bc566a7b8f7674c696fc05d799e12269ec42
2013-12-19 11:31:36 -08:00
Alan Viverette
65a6ef6f34 Additional captioning fonts
Change-Id: Ib3298f65b602d581fa031576c3b9026bfd6a8672
2013-12-19 11:30:48 -08:00
Andres Morales
ef693b5707 Merge "Settings for NFC Unlock" 2013-12-12 17:38:26 +00:00