OSDN Git Service

android-x86/packages-apps-Settings.git
12 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Fri, 4 Nov 2011 14:57:21 +0000 (07:57 -0700)]
Reconcile with ics-factoryrom-2-release

Change-Id: I1b9c07a111d23bd863d4beb0a31a2ab949e9eae7

12 years agoRevert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics...
The Android Automerger [Thu, 3 Nov 2011 03:58:19 +0000 (20:58 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"

This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.

12 years agoRevert "Merge "Fix WPS pin input UI" into ics-mr0"
The Android Automerger [Thu, 3 Nov 2011 03:58:10 +0000 (20:58 -0700)]
Revert "Merge "Fix WPS pin input UI" into ics-mr0"

This reverts commit 19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to 480b2e440646e4859ebdd88b82441b4bd9a61651.

12 years agomerge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Thu, 3 Nov 2011 03:53:25 +0000 (20:53 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0

12 years agoBring back Android Dreams.
Daniel Sandler [Thu, 3 Nov 2011 03:30:27 +0000 (23:30 -0400)]
Bring back Android Dreams.

Bug: 5121105
Change-Id: I29ddee7e4a83a01844cdb735de14c02dcbf3086c

12 years agoam 553a2bda: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 3 Nov 2011 00:04:17 +0000 (00:04 +0000)]
am 553a2bda: (-s ours) Import revised translations.  DO NOT MERGE

* commit '553a2bda178d246e99bce744fefa2a5765c6cb04':
  Import revised translations.  DO NOT MERGE

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 22:19:25 +0000 (15:19 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I845d6b903ad4314b9aa61ea9ee03d7248164330a

12 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Wed, 2 Nov 2011 17:53:29 +0000 (10:53 -0700)]
Reconcile with ics-factoryrom-2-release

Change-Id: Iea3f36179ad20263df6dbf71a5f4fefc7a931704

12 years agoRevert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics...
The Android Automerger [Wed, 2 Nov 2011 17:07:45 +0000 (10:07 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"

This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.

12 years agoRevert "Merge "Fix WPS pin input UI" into ics-mr0"
The Android Automerger [Wed, 2 Nov 2011 17:07:38 +0000 (10:07 -0700)]
Revert "Merge "Fix WPS pin input UI" into ics-mr0"

This reverts commit 19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to 480b2e440646e4859ebdd88b82441b4bd9a61651.

12 years agomerge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 16:48:56 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0

12 years agoRevert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics...
The Android Automerger [Wed, 2 Nov 2011 11:41:12 +0000 (04:41 -0700)]
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"

This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.

12 years agoam 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 04:18:13 +0000 (04:18 +0000)]
am 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0

* commit '1103c3beb80c522778ae7b925d703e2ac3afd5e3':
  Use component details to send provisionig intent

12 years agoMerge "Use component details to send provisionig intent" into ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 04:15:30 +0000 (21:15 -0700)]
Merge "Use component details to send provisionig intent" into ics-mr0

12 years agoUse component details to send provisionig intent
Irfan Sheriff [Tue, 1 Nov 2011 21:58:31 +0000 (14:58 -0700)]
Use component details to send provisionig intent

Bug: 5544654
Change-Id: I0bd33c2a0d4c657bd10ba966d67ff54c27e42ea1

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:51:13 +0000 (13:51 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Nov 2011 20:37:58 +0000 (13:37 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I65499d2eade80a1bb57f7f6fe27018c106554300

12 years agoam 7d1737e0: Reconcile with ics-factoryrom-2-release
The Android Open Source Project [Tue, 1 Nov 2011 17:10:37 +0000 (17:10 +0000)]
am 7d1737e0: Reconcile with ics-factoryrom-2-release

* commit '7d1737e045ae970049e723c5b3c681860d552ad6':
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"

12 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Tue, 1 Nov 2011 17:08:55 +0000 (10:08 -0700)]
Reconcile with ics-factoryrom-2-release

Change-Id: I744c148cd22781c33cd51cd734a055952f39d648

12 years agoam 1b4f5d74: Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into...
Nick Pelly [Tue, 1 Nov 2011 00:04:08 +0000 (00:04 +0000)]
am 1b4f5d74: Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0

* commit '1b4f5d743594971eab9747a84ee21420a8602bbe':
  Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.

12 years agoMerge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0
Nick Pelly [Tue, 1 Nov 2011 00:02:15 +0000 (17:02 -0700)]
Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0

12 years agoRevert "Merge "Fix WPS pin input UI" into ics-mr0"
The Android Automerger [Mon, 31 Oct 2011 23:47:58 +0000 (16:47 -0700)]
Revert "Merge "Fix WPS pin input UI" into ics-mr0"

This reverts commit 19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to 480b2e440646e4859ebdd88b82441b4bd9a61651.

12 years agoFix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.
Nick Pelly [Mon, 31 Oct 2011 21:11:29 +0000 (14:11 -0700)]
Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.

ACTION_NFCSHARING_SETTINGS is a new ICS API that doesn't work until now.
It allows application to show UI to turn Android Beam on.

Add ACTION_NFC_SHARING - exposed in MR2.

Remove ANDROID_BEAM_SETTINGS, this was orphanned.

I wish we had renamed ACTION_NFCSHARING_SETTINGS to ACTION_NDEF_PUSH_SETTINGS,
but too late now. It's already released in SDK.

Bug: 5465097
Change-Id: I641b2efa39a3567cbd1c31587f3b67b1b0a0caa0

Signed-off-by: Nick Pelly <npelly@google.com>
12 years agoam 19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0
Irfan Sheriff [Mon, 31 Oct 2011 21:03:19 +0000 (21:03 +0000)]
am 19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0

* commit '19d9a3d2846c538502003a81522f6d285b9ff24b':
  Fix WPS pin input UI

12 years agoMerge "Fix WPS pin input UI" into ics-mr0
Irfan Sheriff [Mon, 31 Oct 2011 21:01:42 +0000 (14:01 -0700)]
Merge "Fix WPS pin input UI" into ics-mr0

12 years agoFix WPS pin input UI
Irfan Sheriff [Mon, 31 Oct 2011 20:37:06 +0000 (13:37 -0700)]
Fix WPS pin input UI

Change If60f42f7 introduces a bug for the WPS UI.

The input from access point text box should be shown for KEYPAD input

Bug: 5542833
Change-Id: I27f758b31b69425f51fe7ed17bf9b787a1bf66cc

12 years agoam 480b2e44: Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0
Amith Yamasani [Sun, 30 Oct 2011 21:37:12 +0000 (21:37 +0000)]
am 480b2e44: Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0

* commit '480b2e440646e4859ebdd88b82441b4bd9a61651':
  Use vibrate icon in volume settings when appropriate.

12 years agoam 6fded4ab: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Oct 2011 03:15:30 +0000 (03:15 +0000)]
am 6fded4ab: (-s ours) Import revised translations.  DO NOT MERGE

* commit '6fded4ab3fca2d79a82c40f90370b12489456dff':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Use vibrate icon in volume settings when appropriate." into ics-mr0
Amith Yamasani [Sat, 29 Oct 2011 02:40:42 +0000 (19:40 -0700)]
Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0

12 years agoUse vibrate icon in volume settings when appropriate.
Amith Yamasani [Sat, 29 Oct 2011 02:22:05 +0000 (19:22 -0700)]
Use vibrate icon in volume settings when appropriate.

Clicking on icon will now put it in vibrate mode (instead of silent)
if vibrate is enabled for silent mode.

Bug: 5530217
Change-Id: Icd314981734af2cb37cf47fe27fc697bf447af73

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Oct 2011 00:06:49 +0000 (17:06 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Ib938444059955eab65a79afef9d9ec3c971dcd8c

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 21:01:37 +0000 (14:01 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Oct 2011 20:54:20 +0000 (13:54 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I8a28a888b322b379800fae19299e91a3b485b2f8

12 years agoMerge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1
Narayan Kamath [Fri, 28 Oct 2011 09:15:38 +0000 (02:15 -0700)]
Merge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1

12 years agoam d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
Jaikumar Ganesh [Fri, 28 Oct 2011 02:14:06 +0000 (02:14 +0000)]
am d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0

* commit 'd9bf0d1afa7857ec3f678ac2aa041b42bcf2ef5a':
  Fix UI issue with Bluetooth Settings.

12 years agoMerge "Fix UI issue with Bluetooth Settings." into ics-mr0
Jaikumar Ganesh [Thu, 27 Oct 2011 23:49:39 +0000 (16:49 -0700)]
Merge "Fix UI issue with Bluetooth Settings." into ics-mr0

12 years agoFix UI issue with Bluetooth Settings.
Jaikumar Ganesh [Thu, 27 Oct 2011 23:23:30 +0000 (16:23 -0700)]
Fix UI issue with Bluetooth Settings.

When a profile fails to connect, the preference was getting unset.

Patch generated in conversation with Jake Hamby.

Bug: 5526404
Change-Id: I27ab8d337b6d121f8d369841d3f9a691293ef922

12 years agoam 65c61ef8: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 21:46:47 +0000 (21:46 +0000)]
am 65c61ef8: (-s ours) Import revised translations.  DO NOT MERGE

* commit '65c61ef8cd6904c4b378cb04dbe564229ff70cd7':
  Import revised translations.  DO NOT MERGE

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 16:53:19 +0000 (09:53 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I2731df18113b720c7b2894c670302330c9c29f9f

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Thu, 27 Oct 2011 16:45:59 +0000 (09:45 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoHide the "install voice data" preference by default. DO NOT MERGE
Narayan Kamath [Thu, 27 Oct 2011 15:34:50 +0000 (16:34 +0100)]
Hide the "install voice data" preference by default. DO NOT MERGE

Re-added if there are voices to install.
DO NOT MERGE : Was already submitted to master.

bug:5511343
Change-Id: Iac95f37c3dda3b213f6ba34c32b7dc725673d64d

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 00:40:52 +0000 (17:40 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I22ad234b19bb6270f7edd9461590d119d7dc4eff

12 years agoam d27fa50a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Wed, 26 Oct 2011 21:08:59 +0000 (21:08 +0000)]
am d27fa50a: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit 'd27fa50a0a823403fd77929f8b6a40a260a27577':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Wed, 26 Oct 2011 21:06:13 +0000 (14:06 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 26 Oct 2011 18:27:35 +0000 (11:27 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 18:09:44 +0000 (11:09 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I9d5e132b9d4a9e505269ef9998acabfba8ffa975

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 17:24:56 +0000 (10:24 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I7d78b6f42431a906f9a8f624c9f0e573859ea4bc

12 years agoam a94320e3: Settings use minimum manual brightness from config
Todd Poynor [Wed, 26 Oct 2011 12:22:41 +0000 (12:22 +0000)]
am a94320e3: Settings use minimum manual brightness from config

* commit 'a94320e332f3c14b6ebb2359cc3fe363b8dfe688':
  Settings use minimum manual brightness from config

12 years agoSettings use minimum manual brightness from config
Todd Poynor [Wed, 26 Oct 2011 00:11:56 +0000 (17:11 -0700)]
Settings use minimum manual brightness from config

Remove use of deprecated android.os.Power.BRIGHTNESS_DIM (20) + 10.

Change-Id: I24aff7d7fc93b4b67dedb1047bbbd4dbe3fae382
Signed-off-by: Todd Poynor <toddpoynor@google.com>
12 years agomerge ics-mr0
Ed Heyl [Tue, 25 Oct 2011 20:19:41 +0000 (20:19 +0000)]
merge ics-mr0

Change-Id: I264e87a888059ada62b56a3ff7acf44cb0657cb8

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 25 Oct 2011 00:09:58 +0000 (17:09 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295

12 years agoam b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 23:02:31 +0000 (16:02 -0700)]
am b8568b21: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit 'b8568b21118a423c6e30e736c5702b3f946b6179':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 23:00:30 +0000 (16:00 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 21:41:59 +0000 (14:41 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I1ccc1ed633e301bb2db039ea8ce1041a00daccc3

12 years agoam cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0
Irfan Sheriff [Fri, 21 Oct 2011 21:38:39 +0000 (14:38 -0700)]
am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0

* commit 'cb5fa5a44779f790fae87102a573816ecc15dd3d':
  Remove wifidirect UI listing

12 years agoMerge "Settings applications processes viewer color updates"
Peter Ng [Fri, 21 Oct 2011 21:14:44 +0000 (14:14 -0700)]
Merge "Settings applications processes viewer color updates"

12 years agoam 388c9e2f: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 20:52:11 +0000 (13:52 -0700)]
am 388c9e2f: (-s ours) Import revised translations.  DO NOT MERGE

* commit '388c9e2f14c4b533ec9d19c1513e51353de89e75':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Remove wifidirect UI listing" into ics-mr0
Irfan Sheriff [Fri, 21 Oct 2011 20:29:53 +0000 (13:29 -0700)]
Merge "Remove wifidirect UI listing" into ics-mr0

12 years agoRemove wifidirect UI listing
Irfan Sheriff [Fri, 21 Oct 2011 20:11:37 +0000 (13:11 -0700)]
Remove wifidirect UI listing

Was used for testing. remove it until proper UI is
added

Bug: 5497909
Change-Id: Ic8bd1afbe348ede9031f2446b30a99d7efc88f7c

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 01:04:50 +0000 (18:04 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c

12 years agoSettings applications processes viewer color updates
Peter Ng [Thu, 20 Oct 2011 21:04:53 +0000 (14:04 -0700)]
Settings applications processes viewer color updates

Change-Id: I233bed85c331aa909aebcd3358f7b985d9eaa473

12 years agoam 49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Thu, 20 Oct 2011 18:32:06 +0000 (11:32 -0700)]
am 49a681c4: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '49a681c4928d63b86fca0a546ee60b4f95d16669':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Thu, 20 Oct 2011 18:29:07 +0000 (11:29 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:16:21 +0000 (11:16 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886

12 years agoam 8123493e: Fix 5428748: Added more options for biometric weak
Danielle Millett [Wed, 19 Oct 2011 22:14:41 +0000 (15:14 -0700)]
am 8123493e: Fix 5428748: Added more options for biometric weak

* commit '8123493ef905a210bd00b0c623459f4c86505298':
  Fix 5428748: Added more options for biometric weak

12 years agoFix 5428748: Added more options for biometric weak
Danielle Millett [Wed, 19 Oct 2011 17:58:30 +0000 (13:58 -0400)]
Fix 5428748: Added more options for biometric weak

Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.

Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88

12 years agoam 0bcd8a95: Fix 5352588: Accept view intent without URI.
Chih-Chung Chang [Wed, 19 Oct 2011 10:33:46 +0000 (03:33 -0700)]
am 0bcd8a95: Fix 5352588: Accept view intent without URI.

* commit '0bcd8a95a96566d9e2c97c3305ee0dccf758ca7a':
  Fix 5352588: Accept view intent without URI.

12 years agoFix 5352588: Accept view intent without URI.
Chih-Chung Chang [Tue, 18 Oct 2011 12:00:02 +0000 (20:00 +0800)]
Fix 5352588: Accept view intent without URI.

Change-Id: Ibfcf32a7d27c3ac2d3fa3695e430b3e29f3ecd20

12 years agoMerge "Import revised translations."
Eric Fischer [Tue, 18 Oct 2011 23:35:18 +0000 (16:35 -0700)]
Merge "Import revised translations."

12 years agoImport revised translations.
Eric Fischer [Tue, 18 Oct 2011 22:45:53 +0000 (15:45 -0700)]
Import revised translations.

Change-Id: I257f94325e7f588845bcf446e497ff827d4b2cec

12 years agoMerge "Show IP address of current active link instead of just the WiFi IP address."
Amith Yamasani [Tue, 18 Oct 2011 22:05:22 +0000 (15:05 -0700)]
Merge "Show IP address of current active link instead of just the WiFi IP address."

12 years agoam 644fa424: Work on issue #5461497: Landed on Welcome screen after a tap on \'Next...
Dianne Hackborn [Tue, 18 Oct 2011 21:36:30 +0000 (14:36 -0700)]
am 644fa424: Work on issue #5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500

* commit '644fa4243b4c288c85845b3f86aab25135635729':
  Work on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500

12 years agoWork on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
Dianne Hackborn [Tue, 18 Oct 2011 20:38:03 +0000 (13:38 -0700)]
Work on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500

With the corresponding change for the activity manager to allow the home
activity to finish itself, this activity can now be a little less dirty
and just call finish() when it finds it is not needed.

Change-Id: I1a449c7bec9fba659e27a9e918f8a9b0c55b2098

12 years agoam 39b8eb6c: Merge "Accessibility service toggle setting state not preserved on scree...
Svetoslav Ganov [Tue, 18 Oct 2011 20:16:59 +0000 (13:16 -0700)]
am 39b8eb6c: Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0

* commit '39b8eb6ce545287cd77bea465d280772669c68d1':
  Accessibility service toggle setting state not preserved on screen rotation.

12 years agoMerge "Accessibility service toggle setting state not preserved on screen rotation...
Svetoslav Ganov [Tue, 18 Oct 2011 20:14:38 +0000 (13:14 -0700)]
Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0

12 years agoAccessibility service toggle setting state not preserved on screen rotation.
Svetoslav Ganov [Tue, 18 Oct 2011 18:58:21 +0000 (11:58 -0700)]
Accessibility service toggle setting state not preserved on screen rotation.

The state of the toggle switch for enabling/disabling an accessibility service
is not preserved on screen rotation after its state has been changed once.

bug:5478062

Change-Id: Ie453f78bc07dcd39d88bb4acf260768eccc73a74

12 years agoam 3d0b5254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 18:33:36 +0000 (11:33 -0700)]
am 3d0b5254: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '3d0b525491559f59d65156fca5783f80f2bddc14':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 18:31:06 +0000 (11:31 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:13:37 +0000 (11:13 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Idddc20bec80db65304678bc5ad191cff3f2d2c5f

12 years agoMerge "data usage color standardization"
Peter Ng [Tue, 18 Oct 2011 17:45:34 +0000 (10:45 -0700)]
Merge "data usage color standardization"

12 years agoam 4c9a5fe6: Merge "Fix 5466557: Removed secondary screenlock settings labels" into...
Danielle Millett [Tue, 18 Oct 2011 17:29:48 +0000 (10:29 -0700)]
am 4c9a5fe6: Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0

* commit '4c9a5fe6a3765ecd7617b611463766cd72706458':
  Fix 5466557: Removed secondary screenlock settings labels

12 years agoMerge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0
Danielle Millett [Tue, 18 Oct 2011 17:27:41 +0000 (10:27 -0700)]
Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0

12 years agoam 6ab0c12c: Updated bandwidth assets
Justin Ho [Tue, 18 Oct 2011 16:33:09 +0000 (09:33 -0700)]
am 6ab0c12c: Updated bandwidth assets

* commit '6ab0c12ca417aef49d2c287b8d215c9e66ae154d':
  Updated bandwidth assets

12 years agoUpdated bandwidth assets
Justin Ho [Tue, 18 Oct 2011 01:04:18 +0000 (18:04 -0700)]
Updated bandwidth assets

Change-Id: Ia180ff9dfb020ab2f3528638f522c38f11ea010f

12 years agoFix 5466557: Removed secondary screenlock settings labels
Danielle Millett [Mon, 17 Oct 2011 23:21:19 +0000 (19:21 -0400)]
Fix 5466557: Removed secondary screenlock settings labels

Removed summary line from the screen lock picker and displaying
the about screen for face unlock every time instead of just the
first time

Change-Id: Iac572d2366acf28d32e632e8dcdde63475641e39

12 years agodata usage color standardization
Peter Ng [Tue, 18 Oct 2011 00:34:58 +0000 (17:34 -0700)]
data usage color standardization

Change-Id: I7c46ecd5b0730dc524bc788cb941493f3534cb20

12 years agoShow IP address of current active link instead of just the WiFi IP address.
Amith Yamasani [Mon, 17 Oct 2011 23:41:00 +0000 (16:41 -0700)]
Show IP address of current active link instead of just the WiFi IP address.

Bug: 5359194

Show "Unavailable" only if there's no active link.

Change-Id: I82ba6bda3a08ea84080a8d8cda331f22d7c7a2bd

12 years agoam 7a33de4c: Merge "Update wifi icons" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 23:34:41 +0000 (16:34 -0700)]
am 7a33de4c: Merge "Update wifi icons" into ics-mr0

* commit '7a33de4c004c9093682b54afa3deab2fdf9ed5f6':
  Update wifi icons

12 years agoMerge "Update wifi icons" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 23:33:07 +0000 (16:33 -0700)]
Merge "Update wifi icons" into ics-mr0

12 years agoUpdate wifi icons
Justin Ho [Mon, 17 Oct 2011 23:04:31 +0000 (16:04 -0700)]
Update wifi icons

Change-Id: I7a82b96df6c44bc17d70631ef36dc5ad733515c4

12 years agoam 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0
John Huang [Mon, 17 Oct 2011 22:22:28 +0000 (15:22 -0700)]
am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0

* commit '7b21e97c2a213afbb7ab0d2247e751e8194f89fc':
  Add "Roaming protocol" to APN editor.

12 years agoMerge "Add "Roaming protocol" to APN editor." into ics-mr0
John Huang [Mon, 17 Oct 2011 22:20:28 +0000 (15:20 -0700)]
Merge "Add "Roaming protocol" to APN editor." into ics-mr0

12 years agoMerge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232"
Claudia de Veaux [Mon, 17 Oct 2011 21:20:29 +0000 (14:20 -0700)]
Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 54676075163232"

12 years agoRestore Wi-Fi spelling; change "extra-large" to "huge".
Claudia de Veaux [Mon, 17 Oct 2011 19:54:20 +0000 (12:54 -0700)]
Restore Wi-Fi spelling; change "extra-large" to "huge".
Bugs: 54676075163232

Change-Id: Ia0085a085b6f2d1ec9d5a00d08dee4bb38b10f22

12 years agoFix capitalization of Face Unlock.
Eric Fischer [Mon, 17 Oct 2011 18:28:34 +0000 (11:28 -0700)]
Fix capitalization of Face Unlock.

Bug 5447766

Change-Id: I4a91bd00bb09251af170ca054a8aa0bd88c5eec0

12 years agoUpdate enabled subtypes in the input method subtype enabler in "onResume"
satok [Mon, 17 Oct 2011 12:54:06 +0000 (21:54 +0900)]
Update enabled subtypes in the input method subtype enabler in "onResume"

Bug: 5446825
Change-Id: Iab52ecb8a7334b7be3a81350fbfc9b02d09e88d4

12 years agoAdd "Roaming protocol" to APN editor.
John Huang [Sun, 16 Oct 2011 05:41:11 +0000 (22:41 -0700)]
Add "Roaming protocol" to APN editor.

Field already exists in the APN database.  Now it is user updatable.
Only enable it on CDMA for this release (means it is not really user
visible, but available for testing purposes).  Will revisit enabling
for all in a future release.

Bug: 5420680
Change-Id: Ia2c551c48ae9ce47c57ad36ec73d152441a27284

12 years agoFix issue #5460725: Crespo does not fully boot after a wipe
Dianne Hackborn [Sun, 16 Oct 2011 18:49:00 +0000 (11:49 -0700)]
Fix issue #5460725: Crespo does not fully boot after a wipe

Add a hack to relaunch whatever was supposed to be launched
(presumably home) when CryptKeeper discovers it shouldn't be
running.

Change-Id: I1406b8d6e8d484ed1c169fa4908a9e05e8c7c2ad

12 years agoData usage chart fixes.
Jeff Sharkey [Fri, 14 Oct 2011 21:36:58 +0000 (14:36 -0700)]
Data usage chart fixes.

Always draw first data point at 0. Each point should include full
value of current bucket, instead of lagging behind by one.

Bug: 540491754048615178305
Change-Id: I5fa63bc84cc1f9c0403fb03effd5affd2f01ad4c

12 years agoMerge "Toast when finished pattern or password setup." into ics-mr0
Jeff Sharkey [Thu, 13 Oct 2011 19:37:47 +0000 (12:37 -0700)]
Merge "Toast when finished pattern or password setup." into ics-mr0