OSDN Git Service

android-x86/packages-apps-Settings.git
12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Nov 2011 21:33:52 +0000 (13:33 -0800)]
Import revised translations. DO NOT MERGE

Change-Id: I3c719179477fda49580dbc58f79443a4e5c25cc9

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Nov 2011 01:42:11 +0000 (17:42 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I57c6d5fdf39f880dab16d5db78bc6673d74090a9

12 years agoAdd provisioning checks for BT and USB
Irfan Sheriff [Fri, 4 Nov 2011 19:08:56 +0000 (12:08 -0700)]
Add provisioning checks for BT and USB

Bug: 5568752
Change-Id: Ide4f3c0eb19f8e70e301a13d81b76dd6a0516c3a

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 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 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 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 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 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 "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 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-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 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 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 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 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 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 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 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 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 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 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 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 "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 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 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 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 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

12 years agoMerge "Use new status bar disable flags." into ics-mr0
Daniel Sandler [Thu, 13 Oct 2011 19:34:51 +0000 (12:34 -0700)]
Merge "Use new status bar disable flags." into ics-mr0

12 years agoToast when finished pattern or password setup.
Jeff Sharkey [Wed, 12 Oct 2011 00:26:27 +0000 (17:26 -0700)]
Toast when finished pattern or password setup.

Bug: 5443781
Change-Id: I599ccbb9c535396e05a2a22ab6d3ef302fb9c623

12 years agoFix 5444675: Don't show "Vibrate on touch" in password lock options
Jim Miller [Thu, 13 Oct 2011 00:46:17 +0000 (17:46 -0700)]
Fix 5444675: Don't show "Vibrate on touch" in password lock options

Don't show "Vibrate on touch" for password lock screen options because
vibrate is controlled by the IME setting in this case.

Change-Id: Idc8c73048a0c396037457638faed02331ed104f3

12 years agoUse new status bar disable flags.
Daniel Sandler [Wed, 12 Oct 2011 19:34:23 +0000 (15:34 -0400)]
Use new status bar disable flags.

Requires frameworks/base change I04eb2245.

Bug: 5380495
Change-Id: Ia9e5c25e224b38c1cdad4cd725fc425de90f8344

12 years agoMerge "Add disclaimer string."
Jeff Sharkey [Tue, 11 Oct 2011 00:20:53 +0000 (17:20 -0700)]
Merge "Add disclaimer string."

12 years agoAdd disclaimer string.
Jeff Sharkey [Tue, 11 Oct 2011 00:04:12 +0000 (17:04 -0700)]
Add disclaimer string.

Bug: 5337015
Change-Id: Iabeb8490ed51f77e98f3c5317e31d30e4e780178

12 years agoMerge "Import revised translations."
Eric Fischer [Mon, 10 Oct 2011 18:48:47 +0000 (11:48 -0700)]
Merge "Import revised translations."

12 years agoImport revised translations.
Eric Fischer [Mon, 10 Oct 2011 18:25:09 +0000 (11:25 -0700)]
Import revised translations.

Change-Id: I064a55b4923fcc09ae2172e1b21cb81eee0db653

12 years agoBring back network counters in battery stats.
Jeff Sharkey [Sun, 9 Oct 2011 20:21:10 +0000 (13:21 -0700)]
Bring back network counters in battery stats.

Bug: 4902271
Change-Id: I0900c030407a86efb14a9d528ab355c56f54679e

12 years agoMerge "Remove pending message when fragment is paused."
Amith Yamasani [Fri, 7 Oct 2011 21:43:24 +0000 (14:43 -0700)]
Merge "Remove pending message when fragment is paused."

12 years agoRemove pending message when fragment is paused.
Amith Yamasani [Fri, 7 Oct 2011 20:58:39 +0000 (13:58 -0700)]
Remove pending message when fragment is paused.

Bug: 5422788

Converted the runnable to a message and removed any pending messages in onPause.

Change-Id: I048413ae2abd69a359b1fa2c648d98df3c3ae343

12 years agoMerge "Data usage grid asset updates"
Peter Ng [Fri, 7 Oct 2011 19:32:13 +0000 (12:32 -0700)]
Merge "Data usage grid asset updates"

12 years agoData usage grid asset updates
Peter Ng [Fri, 7 Oct 2011 01:35:13 +0000 (18:35 -0700)]
Data usage grid asset updates

Change-Id: I232e784c8552f4f185814f4d5b8082894438c500

12 years agoFix string for hdpi devices
Romain Guy [Thu, 6 Oct 2011 01:49:52 +0000 (18:49 -0700)]
Fix string for hdpi devices

Change-Id: Icfad64a4c7df0a6c68336cc361e60ec626b5d735

12 years agoMerge "Add mobile hotspot provisioning support"
Irfan Sheriff [Thu, 6 Oct 2011 19:43:01 +0000 (12:43 -0700)]
Merge "Add mobile hotspot provisioning support"

12 years agoAdd mobile hotspot provisioning support
Irfan Sheriff [Thu, 6 Oct 2011 18:45:45 +0000 (11:45 -0700)]
Add mobile hotspot provisioning support

Bug: 5346812
Change-Id: I3e117fb62039c1d8370440ab4109705894011928

12 years agoMerge "Third time is the charm."
Jeff Sharkey [Thu, 6 Oct 2011 05:57:19 +0000 (22:57 -0700)]
Merge "Third time is the charm."

12 years agoThird time is the charm.
Jeff Sharkey [Thu, 6 Oct 2011 05:54:52 +0000 (22:54 -0700)]
Third time is the charm.

Change-Id: Ic58a7f80e3be0c5d1a0531727f0abac0c8f96fba

12 years agoMerge "Fix string breakage."
Jeff Sharkey [Thu, 6 Oct 2011 05:14:24 +0000 (22:14 -0700)]
Merge "Fix string breakage."

12 years agoFix string breakage.
Jeff Sharkey [Thu, 6 Oct 2011 05:13:02 +0000 (22:13 -0700)]
Fix string breakage.

Change-Id: Ib81c1bfd9ef49f7e410887ab5c22e3e3cc31ca22

12 years agoMerge "Adjust data usage strings."
Jeff Sharkey [Thu, 6 Oct 2011 04:59:42 +0000 (21:59 -0700)]
Merge "Adjust data usage strings."

12 years agoMerge "Update string to match wireframe"
Danielle Millett [Thu, 6 Oct 2011 02:04:05 +0000 (19:04 -0700)]
Merge "Update string to match wireframe"

12 years agoUpdate string to match wireframe
Danielle Millett [Thu, 6 Oct 2011 01:49:03 +0000 (21:49 -0400)]
Update string to match wireframe

Change-Id: If406ab1364451e28352d120b473a7a58a124bff4

12 years agoAdjust data usage strings.
Jeff Sharkey [Thu, 6 Oct 2011 00:43:06 +0000 (17:43 -0700)]
Adjust data usage strings.

Bug: 5337015
Change-Id: I55c7ea8175945a6d799845e196299d45bb412403

12 years agoUse WM APIs to change rotation preference.
Jeff Brown [Wed, 5 Oct 2011 18:53:01 +0000 (11:53 -0700)]
Use WM APIs to change rotation preference.
Bug: 5371750

Changing the system setting directly results in inconsistent
behavior among the three different places where "auto-rotate"
settings appear in the UI.  Use the WM APIs instead.

Change-Id: I1a8239af66b1cc3aeec8310383e72fc96c878d73

12 years agoMerge "Don't hide TTS settings if no recognizer is found."
Narayan Kamath [Wed, 5 Oct 2011 12:11:09 +0000 (05:11 -0700)]
Merge "Don't hide TTS settings if no recognizer is found."

12 years agoDon't hide TTS settings if no recognizer is found.
Narayan Kamath [Wed, 5 Oct 2011 11:26:31 +0000 (12:26 +0100)]
Don't hide TTS settings if no recognizer is found.

bug:5412210
Change-Id: I6fdfda7f5f7bcd22acda2fd2b55e0d76f0fab1cd

12 years agoShow a security warning dialog when switching a spell checker
satok [Wed, 5 Oct 2011 09:49:51 +0000 (18:49 +0900)]
Show a security warning dialog when switching a spell checker

Bug: 5402295

Change-Id: I021e6e923fa137248d23c8fa39e68afdf73fead9

12 years agoMerge "Showing tutorial for Face Unlock on first try"
Danielle Millett [Wed, 5 Oct 2011 01:45:03 +0000 (18:45 -0700)]
Merge "Showing tutorial for Face Unlock on first try"

12 years agoShowing tutorial for Face Unlock on first try
Danielle Millett [Wed, 5 Oct 2011 01:00:07 +0000 (21:00 -0400)]
Showing tutorial for Face Unlock on first try

Change-Id: Idf072750e70a9e5bc7699675d8a7a9c57900eea3

12 years agoMerge "Handle unexpected null cursor and don't forget to close it."
Amith Yamasani [Tue, 4 Oct 2011 22:28:06 +0000 (15:28 -0700)]
Merge "Handle unexpected null cursor and don't forget to close it."

12 years agoFix mismatched markup in Settings strings.
Eric Fischer [Tue, 4 Oct 2011 21:57:57 +0000 (14:57 -0700)]
Fix mismatched markup in Settings strings.

Revert "Revert "Settings strings cleanup per standards.""

Bugs: 51657455163232516266851626675162328

Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design.
Will file separate bug to have the titles removed properly;
for now I just made the string empty.

This reverts commit e2db5875f6e84398a976135c321697a506aaf4df.

Change-Id: I0f865d1441d990e5e63f2a257a27ae521220af14

12 years agoHandle unexpected null cursor and don't forget to close it.
Amith Yamasani [Tue, 4 Oct 2011 22:00:21 +0000 (15:00 -0700)]
Handle unexpected null cursor and don't forget to close it.

Bug: 5406071
Change-Id: Ia40cf7e5a3e32d6f364e787ee66580c685507571

12 years agoMerge "Introduce half-brightness icon in Power Control widget."
Amith Yamasani [Tue, 4 Oct 2011 21:03:47 +0000 (14:03 -0700)]
Merge "Introduce half-brightness icon in Power Control widget."

12 years agoMerge "Bug 5126088 - update layout for activate device policy activity"
Adam Powell [Tue, 4 Oct 2011 20:53:06 +0000 (13:53 -0700)]
Merge "Bug 5126088 - update layout for activate device policy activity"

12 years agoBug 5126088 - update layout for activate device policy activity
Adam Powell [Tue, 4 Oct 2011 20:48:50 +0000 (13:48 -0700)]
Bug 5126088 - update layout for activate device policy activity

Change-Id: Ifd5963adc0dc30c0a650bac822dbbd7cb938c144

12 years agoMerge "Formatting fix"
Steven Ross [Tue, 4 Oct 2011 20:03:38 +0000 (13:03 -0700)]
Merge "Formatting fix"

12 years agoMerge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 516266...
Claudia de Veaux [Tue, 4 Oct 2011 19:52:16 +0000 (12:52 -0700)]
Merge "Revert "Settings strings cleanup per standards. Bugs: 51657455163232516266851626675162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl""

12 years agoRevert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668,...
Claudia de Veaux [Tue, 4 Oct 2011 19:51:23 +0000 (12:51 -0700)]
Revert "Settings strings cleanup per standards. Bugs: 51657455163232516266851626675162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"

This reverts commit c9c29d90f7cb9db9158b6e3a7464f1db06084c1d

12 years agoMerge "Account for all wake lock usage."
Dianne Hackborn [Tue, 4 Oct 2011 18:51:54 +0000 (11:51 -0700)]
Merge "Account for all wake lock usage."

12 years agoMerge "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 51626...
Claudia de Veaux [Tue, 4 Oct 2011 18:30:03 +0000 (11:30 -0700)]
Merge "Settings strings cleanup per standards. Bugs: 51657455163232516266851626675162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty."

12 years agoMerge "Excluding ChooseLockGeneric from recents"
Steven Ross [Tue, 4 Oct 2011 10:15:16 +0000 (03:15 -0700)]
Merge "Excluding ChooseLockGeneric from recents"

12 years agoAccount for all wake lock usage.
Dianne Hackborn [Tue, 4 Oct 2011 01:34:27 +0000 (18:34 -0700)]
Account for all wake lock usage.

Wake locks can be held outside of what we measure in battery stats,
by things not going through the power manager.  Account for this by
computing the total wake time that is not covered by known wake locks
and screen on time, and blame this on Android OS.

Change-Id: Idf2907bc35f8c35f92155671c8dba521ae9ea804

12 years agoSettings strings cleanup per standards.
Claudia de Veaux [Mon, 3 Oct 2011 22:30:33 +0000 (15:30 -0700)]
Settings strings cleanup per standards.
Bugs: 51657455163232516266851626675162328
Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design. Will
file separate bug to have the titles removed properly; for now I
just made the string empty.

Change-Id: I56b251a0d639f8d25f0908c636226e0d6e7da6a5

More changes to add <xliff:g/> around raw HTML per Eric Fischer.

Fixed redundant <string> tag caught in review.

12 years agoMerge "Reorganized the biometric weak check functions"
Danielle Millett [Tue, 4 Oct 2011 00:38:41 +0000 (17:38 -0700)]
Merge "Reorganized the biometric weak check functions"

12 years agoIntroduce half-brightness icon in Power Control widget.
Amith Yamasani [Mon, 3 Oct 2011 18:54:16 +0000 (11:54 -0700)]
Introduce half-brightness icon in Power Control widget.

Bug: 5358696
Change-Id: Iae484e786f4dd7a5e88078b69053f01425b79aef

12 years agoUpdate settings strings.
Jeff Hamilton [Fri, 30 Sep 2011 18:22:06 +0000 (13:22 -0500)]
Update settings strings.

Bug: 5350022
Change-Id: Ia507b886faa17283bb62fe5bd63afb04b490d015

12 years agoMerge "Fix ISO3 code for spanish in demo strings array."
Bjorn Bringert [Mon, 3 Oct 2011 15:22:21 +0000 (08:22 -0700)]
Merge "Fix ISO3 code for spanish in demo strings array."

12 years agoExcluding ChooseLockGeneric from recents
Steven Ross [Mon, 3 Oct 2011 14:06:44 +0000 (10:06 -0400)]
Excluding ChooseLockGeneric from recents

This excludes ChooseLockGeneric from the list of recent activities,
so that the backup lock doesn't show up there.
This should only impact ChooseLockGeneric.

Change-Id: If9b9d7b7287191cec1a7f41221b1f0451593a5e8

12 years agoFix ISO3 code for spanish in demo strings array.
Narayan Kamath [Mon, 3 Oct 2011 13:46:44 +0000 (14:46 +0100)]
Fix ISO3 code for spanish in demo strings array.

bug:5399728
Change-Id: Ib001425c0ea0298720d9c65f5ece22ecd70ce471

12 years agoFormatting fix
Steven Ross [Mon, 3 Oct 2011 10:50:47 +0000 (06:50 -0400)]
Formatting fix

Change-Id: If2869f2d6d6bc788cfffc1187b4de1deb9cec83b

12 years agoMerge "Import revised translations."
Eric Fischer [Fri, 30 Sep 2011 23:56:22 +0000 (16:56 -0700)]
Merge "Import revised translations."