Commit Graph

4717 Commits

Author SHA1 Message Date
Adrian Roos
5954ff505f Add initial trust agent settings
Adds a first version of the trust agent settings
under Security -> Device Administration -> Trust Agents.

Change-Id: I2e2dc41208d13cc1b11bb21d427c6f86053a3640
2014-03-31 23:00:51 +02:00
Fabrice Di Meglio
7784e3507d Merge "Go Quantum Go!" 2014-03-29 01:49:03 +00:00
Fabrice Di Meglio
23f5447b02 Go Quantum Go!
- use the Quantum Theme light version

Change-Id: I81c40813b8fb59286a370bde33076cdcd73390e5
2014-03-28 18:48:05 -07:00
Lajos Molnar
a46650530f Merge "Add temporary developer setting to use NuPlayer as default media player" 2014-03-28 23:15:42 +00:00
Fabrice Di Meglio
d37e0b6a45 Merge "Settings - update for new UI (no more Drawer)" 2014-03-28 23:08:21 +00:00
Fabrice Di Meglio
d25314d330 Settings - update for new UI (no more Drawer)
- follow the UX spec by no more using a Drawer
- the Dashboard is now a Fragment that contains the list of Headers
- the search results are also put into a Fragment that is replacing
the initial one (Dashboard or other) when expanding the SearchView
- use a SearchView for query input
- when tapping on a Header or a Search Result, re-launch Settings as
an Activity so that we are benefiting from the Activity stack for
UP affordance and BACK button
- manage UP affordance to show it only when needed
- move some Actions to the Menu in the ActionBar for allowing space
to the Search action and removing some clutter
- fix an issue with the Index and WiFiEnabler and their cached Context
that was not updated when there was a Configuration change
- simplify the SettingsActivity code by extracting some inner classes

Change-Id: I50b5f77bb44a7fade1886114dbbc820609a5e63d
2014-03-28 15:51:29 -07:00
Dan Sandler
57e109935b Merge "List apps that advertise notification settings." 2014-03-28 18:51:04 +00:00
Dan Sandler
b19460f4a1 List apps that advertise notification settings.
Apps that have a CATEGORY_NOTIFICATION_PREFERENCES +
CATEGORY_DEFAULT activity will be listed in notification
settings, with a convenient link to that activity so the
user can tweak those settings.

Change-Id: Idc97b2aee3f070225822ebee1ecbeab79e7b9c2d
2014-03-28 14:47:49 -04:00
Lajos Molnar
6b2f7c4471 Add temporary developer setting to use NuPlayer as default media player
Bug: 11784824
Change-Id: Id42cc40d08ada06ec9e57e24473f7f833bc90dca
2014-03-28 11:35:32 -07:00
Baligh Uddin
517f03606f Import translations. DO NOT MERGE
Change-Id: If8a371ad883f5b1d685b551f781b7dd6c2698eba
Auto-generated-cl: translation import
2014-03-26 14:17:52 -07:00
Baligh Uddin
f675b0f4cc Import translations. DO NOT MERGE
Change-Id: If05b5e4e9f0da7a811dcbe2d3837326310338438
Auto-generated-cl: translation import
2014-03-24 13:07:04 -07:00
Baligh Uddin
441d85e30a Merge "Import translations. DO NOT MERGE" 2014-03-20 18:38:24 +00:00
Wei Wang
41f5437def DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This is cherry pick from master/klp-dev changes.
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

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
2014-03-19 22:37:27 -07:00
Baligh Uddin
105f270068 Import translations. DO NOT MERGE
Change-Id: I798e5e572d16aef5e4940923b74bdc25d2ef99b1
Auto-generated-cl: translation import
2014-03-19 13:17:30 -07:00
Amith Yamasani
3929cdcfca Merge "Allow spell checking in owner info field" 2014-03-19 19:47:33 +00:00
Amith Yamasani
07e52cf615 Allow spell checking in owner info field
Bug: 10231042
Change-Id: Ifbf8aa92de9fd92a16e3b292169b1cf7b4d1eb4f
2014-03-19 12:32:54 -07:00
Geoff Mendal
1c71b8e308 Import translations. DO NOT MERGE
Change-Id: I31c08213e25b11114c2ec5d4689815f83ce26270
Auto-generated-cl: translation import
2014-03-17 12:48:05 -07:00
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
6e7db71959 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 04:12:47 +00:00
David Braun
63ac6a06ef am edcb923d: Add string parameter order to default SMS dialog text
* commit 'edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
  Add string parameter order to default SMS dialog text
2014-03-13 18:30:11 +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
fa066b9c1a Merge "Bat stats: misc, percents are of battery drain." 2014-03-13 17:04:59 +00:00
Dianne Hackborn
17452d5238 Bat stats: misc, percents are of battery drain.
Change-Id: I6f1fb6ff33f524fe76d519a6194fad67559193bd
2014-03-13 09:51:19 -07:00
Baligh Uddin
a28c64dd6c Merge "Import translations. DO NOT MERGE" 2014-03-13 16:37:47 +00: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
Alan Viverette
c736f794ac am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-13 10:01:42 +00:00
Baligh Uddin
b4bc781699 Import translations. DO NOT MERGE
Change-Id: I740417ae9fb2163d81b85ec337d2f1687ebb1a5f
Auto-generated-cl: translation import
2014-03-12 12:08:43 -07:00
Baligh Uddin
7c35c10ebc Import translations. DO NOT MERGE
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
2014-03-12 12:02:29 -07:00
Dan Sandler
39e9ab37b1 Merge "Finally, a place for notification settings." 2014-03-12 18:38:22 +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
23d01e0b4b 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-11 23:05:19 +00:00
Alan Viverette
451994bf10 am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-11 23:05:13 +00:00
Baligh Uddin
14b82fd73f Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:37:53 +00:00
Alan Viverette
0100a310d8 am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
  DO NOT MERGE Add preference for caption text opacity
2014-03-11 02:15:28 +00:00
Alan Viverette
a74da813ec am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'd43d5becb359cfdd5e30f691724739ab216011f0':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-11 02:15:27 +00: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
d43d5becb3 Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 2014-03-11 02:11:41 +00:00
Baligh Uddin
a035856515 Import translations. DO NOT MERGE
Change-Id: Ia1690f2bfef7a44b6545da8cef61f06fa691b897
Auto-generated-cl: translation import
2014-03-10 15:39:07 -07:00
Baligh Uddin
f1b94b2f67 Import translations. DO NOT MERGE
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
2014-03-10 15:28:38 -07:00
Wei Wang
5632e40e13 am a8e634ca: am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit 'a8e634ca5367dde80873a0b7643e27284db56336':
  DO NOT MERGE Change bluetooth off display message.
2014-03-08 06:24:57 +00:00
Wei Wang
a8e634ca53 am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '104eea0b97c63b97040dc26ddf3635257e1b19a2':
  DO NOT MERGE Change bluetooth off display message.
2014-03-08 02:02:19 +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
Alan Viverette
af28facb6f DO NOT MERGE Remove extra fragment in captioning preferences
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
2014-03-07 14:06:07 -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
Baligh Uddin
27e9f6d8e7 Import translations. DO NOT MERGE
Change-Id: Id18f29d4a6ce3cc7fe2abc64768d00035b91a4e3
Auto-generated-cl: translation import
2014-03-05 13:07:50 -08:00
Baligh Uddin
dcdbd68ad5 Merge "Import translations. DO NOT MERGE" 2014-03-04 17:11:05 +00:00
Wei Wang
d952fb07fd Change bluetooth off display message.
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
2014-03-03 17:43:19 -08:00