OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoFingerprintSettings improvements
Jim Miller [Fri, 13 Mar 2015 02:26:12 +0000 (19:26 -0700)]
FingerprintSettings improvements

- move fingerprint update notifications to a handler
- touching a known fingerprint now highlights the entry in Settings.
- cleanup - remove HashMap and add new FingerprintPreference class.

Bug 19592835

Change-Id: Ie94f825e34c14fe94648375762482f9243b7dd49

9 years agoMerge "Add flag to hide disabled keyguard options."
Jim Miller [Thu, 12 Mar 2015 21:21:03 +0000 (21:21 +0000)]
Merge "Add flag to hide disabled keyguard options."

9 years agoAdd flag to hide disabled keyguard options.
Jim Miller [Thu, 12 Mar 2015 03:17:39 +0000 (20:17 -0700)]
Add flag to hide disabled keyguard options.

Normally keyguard options are disabled by things like credential
storage and device admins, so we show the reason in ChooseLockGeneric.

However, in the case of fingerprint we want to limit the scope
to just those options that have security (pin,password,pattern).

Bug 19592835

Change-Id: I6832ff692bad538adeec2f2575fca4f8f04f40cf

9 years agoMerge "Don't reset fingerprint storage on devices without fingerprint hw."
Jim Miller [Thu, 12 Mar 2015 17:57:50 +0000 (17:57 +0000)]
Merge "Don't reset fingerprint storage on devices without fingerprint hw."

9 years agoDon't reset fingerprint storage on devices without fingerprint hw.
Jim Miller [Thu, 12 Mar 2015 17:33:53 +0000 (10:33 -0700)]
Don't reset fingerprint storage on devices without fingerprint hw.

Fixes bug 19707354

Change-Id: I26144dc855bff83cdc9c9544c8ab7449274d7b5e

9 years agoam 9f0b7264: (-s ours) am feb731a2: (-s ours) am dd07a862: (-s ours) Import translati...
Geoff Mendal [Thu, 12 Mar 2015 17:25:27 +0000 (17:25 +0000)]
am 9f0b7264: (-s ours) am feb731a2: (-s ours) am dd07a862: (-s ours) Import translations. DO NOT MERGE

* commit '9f0b7264e55ca2ba96cd09df0c307c169c58b56d':
  Import translations. DO NOT MERGE

9 years agoam 3335973a: (-s ours) am f02db6b7: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Mar 2015 17:25:26 +0000 (17:25 +0000)]
am 3335973a: (-s ours) am f02db6b7: (-s ours) Import translations. DO NOT MERGE

* commit '3335973a6710135a299a615c7a48555c51586e97':
  Import translations. DO NOT MERGE

9 years agoMerge "Follow-up on comments from splitting app info"
Jason Monk [Thu, 12 Mar 2015 14:32:00 +0000 (14:32 +0000)]
Merge "Follow-up on comments from splitting app info"

9 years agoMerge "Support some changes to SettingsLib"
Jason Monk [Thu, 12 Mar 2015 14:23:51 +0000 (14:23 +0000)]
Merge "Support some changes to SettingsLib"

9 years agoMerge "Implement additional fingerprint flows in Settings."
Jim Miller [Thu, 12 Mar 2015 01:20:17 +0000 (01:20 +0000)]
Merge "Implement additional fingerprint flows in Settings."

9 years agoImplement additional fingerprint flows in Settings.
Jim Miller [Thu, 5 Mar 2015 02:07:32 +0000 (18:07 -0800)]
Implement additional fingerprint flows in Settings.

- new onboarding flow ("locate sensor")
- changed sensor location image
- changed in-app sensor icon
- remove fingerprint animation since it caused people to
want to tap on it.
- remove enrolled fingerprint templates when switching back to "none" or "slide"
- use real in-app icon for fingerprint
- much improved layout
- basic landscape layout working
- added 250ms delay to final enrollment step so it's not so jarring
- delete is now working
- rename wired, but not functional yet

Bug 19592835

Change-Id: Ie3e73a2fc8f834f1b90e2746c4cc841216aa6031

9 years agoMerge "[WifiSettings] Refactor Wi-Fi required info"
Maurice Lam [Wed, 11 Mar 2015 23:22:19 +0000 (23:22 +0000)]
Merge "[WifiSettings] Refactor Wi-Fi required info"

9 years ago[WifiSettings] Refactor Wi-Fi required info
Maurice Lam [Thu, 5 Mar 2015 19:20:47 +0000 (11:20 -0800)]
[WifiSettings] Refactor Wi-Fi required info

Instead of using an invisible TextView in the layout itself, make the
required info a list header. This paves way for using the Setup
Wizard library by including all the required contents in the ListView
itself.

The required info is not shown since Lollipop, but can be tested with
    adb shell am start -a "com.android.net.wifi.SETUP_WIFI_NETWORK" \
            --es theme material_light \
            --ez useImmersiveMode true \
            --ez wifi_show_wifi_required_info true

Bug: 19698532
Change-Id: I5a7da726b2f49af7dd755b41c73e1a1b4349699c

9 years agoMerge "Don't reset the keystore during password change"
Robin Lee [Wed, 11 Mar 2015 18:47:48 +0000 (18:47 +0000)]
Merge "Don't reset the keystore during password change"

9 years agoam feb731a2: (-s ours) am dd07a862: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 17:25:25 +0000 (17:25 +0000)]
am feb731a2: (-s ours) am dd07a862: (-s ours) Import translations. DO NOT MERGE

* commit 'feb731a2c94d2238587d1a84d0a2d09f99329612':
  Import translations. DO NOT MERGE

9 years agoam f02db6b7: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 17:25:11 +0000 (17:25 +0000)]
am f02db6b7: (-s ours) Import translations. DO NOT MERGE

* commit 'f02db6b7e8fc774e64b812613cde7746d31aa10e':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 13:35:00 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id8312d1b2f877c9236d1f517c5d92d5340f23d6e
Auto-generated-cl: translation import

9 years agoam dd07a862: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:49:26 +0000 (12:49 +0000)]
am dd07a862: (-s ours) Import translations. DO NOT MERGE

* commit 'dd07a86251dd79190bdc7bc811ae09c65eab89d2':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:40:13 +0000 (05:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia9a0856a78edd8afe8c540b8c68e88b063b34b1d
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:28:40 +0000 (05:28 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia835e0d6c351a29462c1d8adcd002f6f1bec598b
Auto-generated-cl: translation import

9 years agoam a3d28d9c: (-s ours) am fd8f5459: (-s ours) am 0d8c3df4: (-s ours) Import translati...
Geoff Mendal [Tue, 10 Mar 2015 15:47:28 +0000 (15:47 +0000)]
am a3d28d9c: (-s ours) am fd8f5459: (-s ours) am 0d8c3df4: (-s ours) Import translations. DO NOT MERGE

* commit 'a3d28d9cccaa743eb050a4c427d11de204525c98':
  Import translations. DO NOT MERGE

9 years agoam fd8f5459: (-s ours) am 0d8c3df4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 17:01:45 +0000 (17:01 +0000)]
am fd8f5459: (-s ours) am 0d8c3df4: (-s ours) Import translations. DO NOT MERGE

* commit 'fd8f545977ae4b5826632d8de293b3d322ae9960':
  Import translations. DO NOT MERGE

9 years agoam 782d81bc: (-s ours) am f91c51b1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:49:34 +0000 (15:49 +0000)]
am 782d81bc: (-s ours) am f91c51b1: (-s ours) Import translations. DO NOT MERGE

* commit '782d81bc70e4bc5b1adbd86119fd70a935e617f6':
  Import translations. DO NOT MERGE

9 years agoam 0d8c3df4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:45:14 +0000 (15:45 +0000)]
am 0d8c3df4: (-s ours) Import translations. DO NOT MERGE

* commit '0d8c3df4d95ec000889e3406ea50475e5d299874':
  Import translations. DO NOT MERGE

9 years agoam f91c51b1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:35:57 +0000 (15:35 +0000)]
am f91c51b1: (-s ours) Import translations. DO NOT MERGE

* commit 'f91c51b13b750f5ccc62ee1d760bd470b78837bb':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 13:35:26 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3136e17493fb2f0d42e1518c5445b48aa203aa90
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 12:41:43 +0000 (05:41 -0700)]
Import translations. DO NOT MERGE

Change-Id: If88c28e5bfe82169fa423ef04bc7cc4ee2aa9962
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 12:30:12 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9e9281f6e2d2e50882fcec514ffc28993787a62a
Auto-generated-cl: translation import

9 years agoDon't reset the keystore during password change
Robin Lee [Fri, 6 Mar 2015 12:12:03 +0000 (12:12 +0000)]
Don't reset the keystore during password change

There is absolutely no advantage to doing this.

Bug: 18817878
Change-Id: Ibb386696e67c316e65f53c28f9249ef2a2a48db6

9 years agoEnsure redaction settings are visible on narrow screens
Adrian Roos [Thu, 5 Mar 2015 19:05:31 +0000 (20:05 +0100)]
Ensure redaction settings are visible on narrow screens

Bug: 18599040
Change-Id: I852f8fa317927f6f786b33f965e9d1feab562518

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Mar 2015 14:46:45 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:41:39 +0000 (06:41 -0800)]
Import translations. DO NOT MERGE

Change-Id: I2ea337dfa70639c56d7e9bce0513f7550cac54f4
Auto-generated-cl: translation import

9 years agoam a6315bde: (-s ours) am a07520f6: (-s ours) am ba5c9ed1: (-s ours) Import translati...
Geoff Mendal [Wed, 4 Mar 2015 14:00:38 +0000 (14:00 +0000)]
am a6315bde: (-s ours) am a07520f6: (-s ours) am ba5c9ed1: (-s ours) Import translations. DO NOT MERGE

* commit 'a6315bde9d4d696a1b23aa1d5be1511ec9a21aed':
  Import translations. DO NOT MERGE

9 years agoam a07520f6: (-s ours) am ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:54:47 +0000 (13:54 +0000)]
am a07520f6: (-s ours) am ba5c9ed1: (-s ours) Import translations. DO NOT MERGE

* commit 'a07520f6888981f4e310aa3c3c49ff6ea04b51d0':
  Import translations. DO NOT MERGE

9 years agoam ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:47:20 +0000 (13:47 +0000)]
am ba5c9ed1: (-s ours) Import translations. DO NOT MERGE

* commit 'ba5c9ed1835cb3eef7dcf6e2968be1b0e5316dc5':
  Import translations. DO NOT MERGE

9 years agoam d1c5ae48: (-s ours) am b4ee938f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:44:17 +0000 (13:44 +0000)]
am d1c5ae48: (-s ours) am b4ee938f: (-s ours) Import translations. DO NOT MERGE

* commit 'd1c5ae486dc09d10dffaf138c98ad6daed182993':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:41:50 +0000 (05:41 -0800)]
Import translations. DO NOT MERGE

Change-Id: I51a7c7c78b210268bc543e3ca81e123b02c0e525
Auto-generated-cl: translation import

9 years agoam b4ee938f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:37:29 +0000 (13:37 +0000)]
am b4ee938f: (-s ours) Import translations. DO NOT MERGE

* commit 'b4ee938f74fdf6ffe3cad237342d7f5034a55053':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:30:02 +0000 (05:30 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1e33ed430ca8680d04f1bccd0253b8e7620c28e3
Auto-generated-cl: translation import

9 years agoMerge "Added Developer Options settings for multi-window mode."
Wale Ogunwale [Tue, 3 Mar 2015 21:28:46 +0000 (21:28 +0000)]
Merge "Added Developer Options settings for multi-window mode."

9 years agoAdded Developer Options settings for multi-window mode.
Wale Ogunwale [Fri, 27 Feb 2015 22:22:04 +0000 (14:22 -0800)]
Added Developer Options settings for multi-window mode.

Enables/disables the development multi-windows UI under Recents UI.
Setting is hidden on -user builds.

Bug: 19494313
Change-Id: Id1ccec5d9552dfdc74cc8d0af26ba7e6c4456166

9 years agoMerge "Prompt for lock pin on VPN screen when credential restriction is enabled."
Julia Reynolds [Tue, 3 Mar 2015 18:42:13 +0000 (18:42 +0000)]
Merge "Prompt for lock pin on VPN screen when credential restriction is enabled."

9 years agoPrompt for lock pin on VPN screen when credential restriction is enabled.
Julia Reynolds [Tue, 3 Mar 2015 17:32:30 +0000 (12:32 -0500)]
Prompt for lock pin on VPN screen when credential restriction is enabled.

If there is no lock pin set.

Bug: 19569109
Change-Id: I9ca17b61e72576f7b90b1598b2ace6e9d79b263a

9 years agoFollow-up on comments from splitting app info
Jason Monk [Tue, 3 Mar 2015 14:05:19 +0000 (09:05 -0500)]
Follow-up on comments from splitting app info

Bug: 19511439
Change-Id: Id1395597262f66514808f71d99978120dbba70e1

9 years agoMerge "Split app info into several screens"
Jason Monk [Tue, 3 Mar 2015 13:35:51 +0000 (13:35 +0000)]
Merge "Split app info into several screens"

9 years agoAdd comment for night mode search keyword translations
Alan Viverette [Tue, 3 Mar 2015 00:49:02 +0000 (16:49 -0800)]
Add comment for night mode search keyword translations

Bug: 19562061
Change-Id: Ifb4100c721331379474d967d3f6ce7fd18a93ed4

9 years agoMerge "Settings app should be available to restricted user"
Fyodor Kupolov [Mon, 2 Mar 2015 19:13:57 +0000 (19:13 +0000)]
Merge "Settings app should be available to restricted user"

9 years agoSettings app should be available to restricted user
Fyodor Kupolov [Mon, 2 Mar 2015 18:59:23 +0000 (10:59 -0800)]
Settings app should be available to restricted user

Fixed a regression, caused by collapsing location and settings entries
into a single preference. Now settings package is explicitly enabled.

Bug: 19434520
Change-Id: I05440d04c100b6a5ee5573ac116bfb4d66782aa8

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 2 Mar 2015 15:34:31 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoSplit app info into several screens
Jason Monk [Tue, 24 Feb 2015 16:35:29 +0000 (11:35 -0500)]
Split app info into several screens

The root screen now only has the uninstall/force stop/disable buttons
and the rest has moved to sub screens listed in a preference list.
The root screen as UI approximate to the new mocks, but the separated
screens (storage, launch by default, etc.) have yet to receive their
visual overhaul.

Bug: 19511439
Change-Id: I4e01fbaefc69e0652edea2429d9e9b028c78e825

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:53:43 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE

Change-Id: I3574bfb3765fa66d505905b0abd2344e832d2c78
Auto-generated-cl: translation import

9 years agoam bd74dff8: (-s ours) am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translati...
Geoff Mendal [Mon, 2 Mar 2015 14:26:10 +0000 (14:26 +0000)]
am bd74dff8: (-s ours) am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translations. DO NOT MERGE

* commit 'bd74dff8b451a7099beb6cacc54f1062d58b5054':
  Import translations. DO NOT MERGE

9 years agoam a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:20:44 +0000 (14:20 +0000)]
am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translations. DO NOT MERGE

* commit 'a377ea1cb1478503629a7b38c8b11687c7658599':
  Import translations. DO NOT MERGE

9 years agoam 130fc5ca: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:13:01 +0000 (14:13 +0000)]
am 130fc5ca: (-s ours) Import translations. DO NOT MERGE

* commit '130fc5caf8083581f7a3d66930b5ae39e2b4ccd1':
  Import translations. DO NOT MERGE

9 years agoam 2e4703f4: (-s ours) am 5c66aacd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:02:20 +0000 (14:02 +0000)]
am 2e4703f4: (-s ours) am 5c66aacd: (-s ours) Import translations. DO NOT MERGE

* commit '2e4703f42222483391fed23bb5e864b0165c7130':
  Import translations. DO NOT MERGE

9 years agoam 5c66aacd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:55:58 +0000 (13:55 +0000)]
am 5c66aacd: (-s ours) Import translations. DO NOT MERGE

* commit '5c66aacd419460e79e84bc0a324cbb60152f32c1':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:55:15 +0000 (05:55 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iaf3498c2c21da6853e8f80ba582c2d4ac6309331
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:43:21 +0000 (05:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: I81c7b09f5de8fffe27b732d45ff00d02ad5e26d1
Auto-generated-cl: translation import

9 years agoAdd fingerprint settings.
Jim Miller [Fri, 20 Feb 2015 05:04:57 +0000 (21:04 -0800)]
Add fingerprint settings.

- Improved layout.
- Enrollment is now working.
- Added vibration and progress feedback.
- Better fingerprint animation logic.
- Poke userActivity() when sensor is touched.
- Added progress animation.
- Only show fingerprint menu item on devices that have fingerprint hw
- Set View state to GONE for views that aren't shown & fix resulting layout issue
- Fix bug where stage wasn't advancing when returning from ChooseLockGeneric.
- Renamed FingerprintSettings to FingerprintEnroll
- Fixed bug with storing fingerprint ids that prevented the last one from being removed.
- Added better progress indication.  When remaining is at max, count that as the first step.
- Fix whitespace formatting in CL

Fixes bug 1953439

Change-Id: I721bf440c63640203af94ce21340d8281076c249

9 years agoMerge "Fix bug #19313587 Settings unusable when userdata is full"
Fabrice Di Meglio [Fri, 27 Feb 2015 19:19:01 +0000 (19:19 +0000)]
Merge "Fix bug #19313587 Settings unusable when userdata is full"

9 years agoMerge "Add support for user-selectable dark/light theme"
Alan Viverette [Fri, 27 Feb 2015 19:15:54 +0000 (19:15 +0000)]
Merge "Add support for user-selectable dark/light theme"

9 years agoFix bug #19313587 Settings unusable when userdata is full
Fabrice Di Meglio [Fri, 27 Feb 2015 19:14:11 +0000 (11:14 -0800)]
Fix bug #19313587 Settings unusable when userdata is full

- take care of low storage space use case: do not start
and Index update if we are is low storage space situation.

Change-Id: Ifa5bb618d087826c004b06aa7821b9634038734c

9 years agoAdd support for user-selectable dark/light theme
Alan Viverette [Thu, 26 Feb 2015 02:47:37 +0000 (18:47 -0800)]
Add support for user-selectable dark/light theme

Updates Settings to use the DayNight theme (real name TBD) and fixes
several colors that were pinned to non-theme values. Adds a setting for
switching theme between light/dark/auto.

Bug: 19368658
Bug: 19369392
Change-Id: I7cd23b7ad38bdb25a01b92e67ff1ee1cdd8a3958

9 years agoMerge "Badge Wi-Fi installer apps"
Robin Lee [Fri, 27 Feb 2015 16:13:55 +0000 (16:13 +0000)]
Merge "Badge Wi-Fi installer apps"

9 years agoBadge Wi-Fi installer apps
Robin Lee [Thu, 26 Feb 2015 12:30:09 +0000 (12:30 +0000)]
Badge Wi-Fi installer apps

Consistent, and more importantly useful to know which version of an app
was responsible for installing a network.

Change-Id: I37e326f419e03b020e17daa7d65c713d1ea6ddc8

9 years agoam 85b04c19: am 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api...
Sanket Padawe [Thu, 26 Feb 2015 23:43:07 +0000 (23:43 +0000)]
am 85b04c19: am 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

* commit '85b04c19ed81e74709d74d2acffd4bd42a3b07de':
  Use TelephonyManager api to get SPN of sim to display in UI.

9 years agoam 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN...
Sanket Padawe [Thu, 26 Feb 2015 23:31:28 +0000 (23:31 +0000)]
am 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

* commit '130a76c806469b5b814b1d647713dd0cdec1fe9f':
  Use TelephonyManager api to get SPN of sim to display in UI.

9 years agoam 2061f4e2: (-s ours) am cfad6fc1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 26 Feb 2015 23:25:47 +0000 (23:25 +0000)]
am 2061f4e2: (-s ours) am cfad6fc1: (-s ours) Import translations. DO NOT MERGE

* commit '2061f4e296a94093920c772cfeb12c03eac98ac6':
  Import translations. DO NOT MERGE

9 years agoam 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to displa...
Sanket Padawe [Thu, 26 Feb 2015 23:18:55 +0000 (23:18 +0000)]
am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

* commit '49d660ac014c3802aa5e694d745b284fc2b601ae':
  Use TelephonyManager api to get SPN of sim to display in UI.

9 years agoam cfad6fc1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 26 Feb 2015 23:14:45 +0000 (23:14 +0000)]
am cfad6fc1: (-s ours) Import translations. DO NOT MERGE

* commit 'cfad6fc1ff4cc23582d8d1a6cb8371ea32c82544':
  Import translations. DO NOT MERGE

9 years agoam 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI....
Sanket Padawe [Thu, 26 Feb 2015 22:04:34 +0000 (22:04 +0000)]
am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

* commit '4e838ca96ec1ebf1df3d75e729facf1fc012b431':
  Use TelephonyManager api to get SPN of sim to display in UI.

9 years agoMerge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
Sanket Padawe [Thu, 26 Feb 2015 21:57:50 +0000 (21:57 +0000)]
Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 26 Feb 2015 21:08:22 +0000 (13:08 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import

9 years agoRaise priority of key settings actions.
Dianne Hackborn [Fri, 20 Feb 2015 20:48:32 +0000 (12:48 -0800)]
Raise priority of key settings actions.

There are a bunch of actions settings handles that are really
part of the platform API, allowing apps to launch various parts
of system UI to have the user do things.  Currently these can
be intercepted by app developers by implementing the same
intent actions -- which will still have the user end up in
the activity picker to select which of the options to use, but
we really shouldn't be allowing them to get in the middle of
this at all.

To fix this, all of the specific actions that are handled by
settings and shouldn't be intercepted now have their priority
raised to 1, so they always override any filters from third
party applications.

Change-Id: I0f7050212beaec013e5ec08899d49f120ce5c249

9 years agoMerge "Allow alternative policy description for secondary users"
Fyodor Kupolov [Wed, 25 Feb 2015 20:21:25 +0000 (20:21 +0000)]
Merge "Allow alternative policy description for secondary users"

9 years agoam a28ffcb5: am 0209af6b: am 6ff1a66c: am 1bbd8814: Removed extra "your" from device...
Lifu Tang [Wed, 25 Feb 2015 20:05:59 +0000 (20:05 +0000)]
am a28ffcb5: am 0209af6b: am 6ff1a66c: am 1bbd8814: Removed extra "your" from device only subtext

* commit 'a28ffcb56e225e0b10ca3803ef00ae583fafb307':
  Removed extra "your" from device only subtext

9 years agoAllow alternative policy description for secondary users
Fyodor Kupolov [Tue, 24 Feb 2015 17:26:53 +0000 (09:26 -0800)]
Allow alternative policy description for secondary users

For policies like wipe-data, device admin policy description should be
customizable for secondary users.

Bug: 19194766
Change-Id: I0907ffb973eae247707380af1be9894ca403010f

9 years agoam 0209af6b: am 6ff1a66c: am 1bbd8814: Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:56:37 +0000 (19:56 +0000)]
am 0209af6b: am 6ff1a66c: am 1bbd8814: Removed extra "your" from device only subtext

* commit '0209af6bc7979ef11011d8cce162c437ca472126':
  Removed extra "your" from device only subtext

9 years agoam 6ff1a66c: am 1bbd8814: Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:50:56 +0000 (19:50 +0000)]
am 6ff1a66c: am 1bbd8814: Removed extra "your" from device only subtext

* commit '6ff1a66c3ce39396ec1cb70c45682407faa31376':
  Removed extra "your" from device only subtext

9 years agoam 1bbd8814: Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:43:20 +0000 (19:43 +0000)]
am 1bbd8814: Removed extra "your" from device only subtext

* commit '1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
  Removed extra "your" from device only subtext

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:28:40 +0000 (06:28 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iefd9997748c2bcfa757e4c138a764640ed6a29af
Auto-generated-cl: translation import

9 years agoRemoved extra "your" from device only subtext
Lifu Tang [Tue, 24 Feb 2015 23:25:27 +0000 (15:25 -0800)]
Removed extra "your" from device only subtext

Bug: 19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2

9 years agoUse TelephonyManager api to get SPN of sim to display in UI.
Sanket Padawe [Tue, 24 Feb 2015 21:30:33 +0000 (13:30 -0800)]
Use TelephonyManager api to get SPN of sim to display in UI.

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7

9 years agoSupport some changes to SettingsLib
Jason Monk [Wed, 4 Feb 2015 17:54:50 +0000 (12:54 -0500)]
Support some changes to SettingsLib

SettingsLib has a couple of bluetooth changes to support quick
settings and as a result a few updates are needed in Settings.

Depends on I7f828f0038ad0cf39274986ece6d486d545f0286
Change-Id: I9b207b74abb0175148fd4a3c421d33ab9a861587

9 years agoMerge "Move isolatable bluetooth code to SettingsLib"
Jason Monk [Tue, 24 Feb 2015 13:23:48 +0000 (13:23 +0000)]
Merge "Move isolatable bluetooth code to SettingsLib"

9 years agoMerge "Move some Tethering code to SettingsLib to share"
Jason Monk [Tue, 24 Feb 2015 13:16:42 +0000 (13:16 +0000)]
Merge "Move some Tethering code to SettingsLib to share"

9 years agoMerge "Add support for MIDI USB configuration to MIDI settings screen"
Mike Lockwood [Mon, 23 Feb 2015 15:36:52 +0000 (15:36 +0000)]
Merge "Add support for MIDI USB configuration to MIDI settings screen"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:37:23 +0000 (06:37 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iad2a04249a925e479142367a6540adb390c607ad
Auto-generated-cl: translation import

9 years agoAdd support for MIDI USB configuration to MIDI settings screen
Mike Lockwood [Fri, 20 Feb 2015 23:41:43 +0000 (15:41 -0800)]
Add support for MIDI USB configuration to MIDI settings screen

Change-Id: I41b7ef2090b8887d5d3c05494de9dd1fb4dd65eb

9 years agoUpdate Multi-SIM setting to use getSubIdForPhoneAccount API.
Santos Cordon [Fri, 6 Feb 2015 13:38:06 +0000 (05:38 -0800)]
Update Multi-SIM setting to use getSubIdForPhoneAccount API.

Settings app should not be parsing the subId direction from the phone
account.  Instead this CL updates the settings app to use a new API to
grab the sub ID.

Change-Id: Iefd1831b04c061168fa2b135a2d296a27e3d4e92

9 years agoMerge "Settings: Reorder the "Calls/messages from" dropdown."
John Spurlock [Thu, 19 Feb 2015 02:00:26 +0000 (02:00 +0000)]
Merge "Settings: Reorder the "Calls/messages from" dropdown."

9 years agoSettings: Reorder the "Calls/messages from" dropdown.
John Spurlock [Thu, 19 Feb 2015 01:57:39 +0000 (20:57 -0500)]
Settings: Reorder the "Calls/messages from" dropdown.

From least to most restrictive: Anyone/Contacts/Starred.

Bug: 19430944
Change-Id: I66326f3a02be615d0edbbd644b83b088f1e306c1

9 years agoMerge "[WifiSettings] Use arrows for advanced options"
Maurice Lam [Wed, 18 Feb 2015 19:38:07 +0000 (19:38 +0000)]
Merge "[WifiSettings] Use arrows for advanced options"

9 years ago[WifiSettings] Use arrows for advanced options
Maurice Lam [Thu, 12 Feb 2015 22:53:59 +0000 (14:53 -0800)]
[WifiSettings] Use arrows for advanced options

Use an arrow pointing up / down for advanced options instead of a
checkbox, making it more clear that it is merely hiding the options,
and not a setting in itself that others are dependent upon.

Bug: 18007635
Change-Id: Ie2f2cca708b661f76749bc4af5918275806af1a8

9 years agoMerge "Clarify important part of longer string"
Alexandra Gherghina [Wed, 18 Feb 2015 16:44:24 +0000 (16:44 +0000)]
Merge "Clarify important part of longer string"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 18 Feb 2015 14:56:56 +0000 (14:56 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:54:11 +0000 (06:54 -0800)]
Import translations. DO NOT MERGE

Change-Id: I2e2f09268940b69cc1ca74d9c7a147f6d536232d
Auto-generated-cl: translation import

9 years agoam 201e61a0: (-s ours) am 84725dfb: (-s ours) am e991b546: (-s ours) Import translati...
Geoff Mendal [Wed, 18 Feb 2015 14:20:12 +0000 (14:20 +0000)]
am 201e61a0: (-s ours) am 84725dfb: (-s ours) am e991b546: (-s ours) Import translations. DO NOT MERGE

* commit '201e61a0fe0590d41aabfb9044ff0fe66fa65299':
  Import translations. DO NOT MERGE

9 years agoam 84725dfb: (-s ours) am e991b546: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:14:03 +0000 (14:14 +0000)]
am 84725dfb: (-s ours) am e991b546: (-s ours) Import translations. DO NOT MERGE

* commit '84725dfb09399bde98c3541691cc330c46e4050d':
  Import translations. DO NOT MERGE

9 years agoam e991b546: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:07:43 +0000 (14:07 +0000)]
am e991b546: (-s ours) Import translations. DO NOT MERGE

* commit 'e991b5461fa67cc92ddcc4cd583a347550f43094':
  Import translations. DO NOT MERGE