OSDN Git Service

android-x86/packages-apps-Settings.git
13 years agoFixes in UsageBarPreference
Gilles Debunne [Fri, 6 May 2011 21:12:13 +0000 (14:12 -0700)]
Fixes in UsageBarPreference

The widget layout that was used resulted in a clipped usage bar.
It also had a 6dip left offset inherited from the default layout
which adds margin after the text (even if the text is empty here).
Used a custom layout for the whole preference to fix this issue.

Other fixes in the drawing code to prevent accumulative rounding
issues.

Change-Id: Ief9bf85260345355615c9670624d86f0893eb2d2

13 years agoUse the old TTS settings API for now.
Narayan Kamath [Thu, 5 May 2011 12:41:11 +0000 (13:41 +0100)]
Use the old TTS settings API for now.

Change-Id: I8ca3fcb0aee5572694e573f4ceaa0df261c807c3

13 years agoMerge "Import revised translations."
Eric Fischer [Tue, 3 May 2011 17:56:31 +0000 (10:56 -0700)]
Merge "Import revised translations."

13 years agoImport revised translations.
Eric Fischer [Mon, 2 May 2011 22:54:52 +0000 (15:54 -0700)]
Import revised translations.

Change-Id: I89ab066cb68227bf5879749ac47c942dcea7339d

13 years agoam d65d1adb: am 3c3490c8: Use new RouteInfo class.
Robert Greenwalt [Mon, 2 May 2011 20:32:15 +0000 (13:32 -0700)]
am d65d1adb: am 3c3490c8: Use new RouteInfo class.

* commit 'd65d1adb5613107583f0cf208d7650c822f581e2':
  Use new RouteInfo class.

13 years agoam 3c3490c8: Use new RouteInfo class.
Robert Greenwalt [Mon, 2 May 2011 20:29:26 +0000 (13:29 -0700)]
am 3c3490c8: Use new RouteInfo class.

* commit '3c3490c819a1a6ce72468c1d867429ac0f86def8':
  Use new RouteInfo class.

13 years agoUse new RouteInfo class.
Robert Greenwalt [Sat, 30 Apr 2011 00:13:44 +0000 (17:13 -0700)]
Use new RouteInfo class.

Change-Id: I144ebb87e6d1809f59ebd32e64e186d836a365f8

13 years agoam a9b3463e: (-s ours) am 643e48b7: (-s ours) am 7c284c2c: Import revised translation...
Eric Fischer [Thu, 28 Apr 2011 18:49:10 +0000 (11:49 -0700)]
am a9b3463e: (-s ours) am 643e48b7: (-s ours) am 7c284c2c: Import revised translations.  DO NOT MERGE

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

13 years agoam 643e48b7: (-s ours) am 7c284c2c: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 28 Apr 2011 17:26:29 +0000 (10:26 -0700)]
am 643e48b7: (-s ours) am 7c284c2c: Import revised translations.  DO NOT MERGE

* commit '643e48b7fd1f1be62ac4bedc1051c00be129006b':
  Import revised translations.  DO NOT MERGE

13 years agoam 7c284c2c: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Apr 2011 22:31:22 +0000 (15:31 -0700)]
am 7c284c2c: Import revised translations.  DO NOT MERGE

* commit '7c284c2c62ce565dacfae641108a2a5033e78721':
  Import revised translations.  DO NOT MERGE

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Apr 2011 20:53:57 +0000 (13:53 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b

13 years agoam fc5a1fe0: Ignoring empty list test in favor of commented out code.
Conley Owens [Wed, 27 Apr 2011 19:16:49 +0000 (12:16 -0700)]
am fc5a1fe0: Ignoring empty list test in favor of commented out code.

* commit 'fc5a1fe0526706ccee48656df55e9f452c305ade':
  Avoid crash when switching to 2G/3G network.

13 years agoIgnoring empty list test in favor of commented out code.
Conley Owens [Wed, 27 Apr 2011 17:32:42 +0000 (10:32 -0700)]
Ignoring empty list test in favor of commented out code.

Change-Id: I478980eb6d56be164bbe22a73ff945ae9c57a57a

13 years agoam bc20d67f: Merge "Avoid crash when switching to 2G/3G network."
Conley Owens [Wed, 27 Apr 2011 16:55:23 +0000 (09:55 -0700)]
am bc20d67f: Merge "Avoid crash when switching to 2G/3G network."

* commit 'bc20d67fedd453eec9dcb127cf9df909a192baf5':
  Avoid crash when switching to 2G/3G network.

13 years agoMerge "Avoid crash when switching to 2G/3G network."
Conley Owens [Wed, 27 Apr 2011 16:51:22 +0000 (09:51 -0700)]
Merge "Avoid crash when switching to 2G/3G network."

13 years agoMerge "Import revised translations."
Eric Fischer [Tue, 26 Apr 2011 23:18:00 +0000 (16:18 -0700)]
Merge "Import revised translations."

13 years agoImport revised translations.
Eric Fischer [Tue, 26 Apr 2011 23:08:29 +0000 (16:08 -0700)]
Import revised translations.

Change-Id: I5cbe714a861e64d3198eac2b33fdeeece500e536

13 years agoMerge "Fix 3402408: Manage "continue" button in ConfirmPassword screen"
Jim Miller [Tue, 26 Apr 2011 22:19:03 +0000 (15:19 -0700)]
Merge "Fix 3402408: Manage "continue" button in ConfirmPassword screen"

13 years agoAvoid crash when switching to 2G/3G network.
Kenneth Westin [Tue, 26 Apr 2011 12:08:45 +0000 (14:08 +0200)]
Avoid crash when switching to 2G/3G network.

Adding test that active APN array is not empty.

Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a

13 years agoImport revised translations.
Eric Fischer [Fri, 22 Apr 2011 19:19:05 +0000 (12:19 -0700)]
Import revised translations.

Change-Id: Id2b5cf8a5e88621dfb371526db231f9f3bf4d400

13 years agoam ac706b98: am 2c3ec092: Remove getCurrentDataConnectionList.
Wink Saville [Wed, 20 Apr 2011 18:41:26 +0000 (11:41 -0700)]
am ac706b98: am 2c3ec092: Remove getCurrentDataConnectionList.

* commit 'ac706b987bad5b46c4f10be0284ae1ed4453261b':
  Remove getCurrentDataConnectionList.

13 years agoam 2c3ec092: Remove getCurrentDataConnectionList.
Wink Saville [Wed, 20 Apr 2011 18:32:53 +0000 (11:32 -0700)]
am 2c3ec092: Remove getCurrentDataConnectionList.

* commit '2c3ec09261bf1503e75328175b5286af5676845e':
  Remove getCurrentDataConnectionList.

13 years agoRemove getCurrentDataConnectionList.
Wink Saville [Wed, 20 Apr 2011 17:24:36 +0000 (10:24 -0700)]
Remove getCurrentDataConnectionList.

I'll add another mechanism which will probably use an
asynchronous interface with the DataConnectionTracker.

Change-Id: I71f80bb9fe0496c42ff9b1ddbf4e36a68d3f1592

13 years agoFix crash if no external storage.
Dianne Hackborn [Wed, 20 Apr 2011 17:19:05 +0000 (10:19 -0700)]
Fix crash if no external storage.

Change-Id: If5b0386b686d65cf9026a3c00459db371ab81b3a

13 years agoFix TTS engine checkbox click handler
Bjorn Bringert [Tue, 19 Apr 2011 13:37:49 +0000 (14:37 +0100)]
Fix TTS engine checkbox click handler

Before, the dialog asking whether to really enable
the engine wasn't shown. Also, the Default engine
list was not refreshed until you left the TTS settings
and came back.

Change-Id: I8cbded0fe9eedbfb05c294d831c91a857349b224

13 years agoFix 3402408: Manage "continue" button in ConfirmPassword screen
Jim Miller [Tue, 19 Apr 2011 01:16:09 +0000 (18:16 -0700)]
Fix 3402408: Manage "continue" button in ConfirmPassword screen

This disables the "continue" button until the user has entered at
least one character.

Change-Id: I3192e1789ba89031ac4cc90f388b32b7af19a445

13 years agoMerge "Add summary details for add wifi network"
Irfan Sheriff [Mon, 18 Apr 2011 20:44:36 +0000 (13:44 -0700)]
Merge "Add summary details for add wifi network"

13 years agoFix 4283049: Restore continue/cancel buttons in LockScreen Settings
Jim Miller [Sat, 16 Apr 2011 01:52:31 +0000 (18:52 -0700)]
Fix 4283049: Restore continue/cancel buttons in LockScreen Settings

This fixes a bug where the continue/cancel buttons were missing
from LockScreen settings in landscape mode.

The change also includes a minor change to enable using the IME enter
key to proceed to the next step.

Change-Id: I2dca0b40e38a128cc0aa637f573da01e779edb73

13 years agoAdd summary details for add wifi network
Irfan Sheriff [Sat, 16 Apr 2011 00:00:11 +0000 (17:00 -0700)]
Add summary details for add wifi network

Bug: 4266690
Change-Id: I3799fa79c0eab0037f207427f64fe2f95e023796

13 years agoImport revised translations.
Eric Fischer [Fri, 15 Apr 2011 21:41:32 +0000 (14:41 -0700)]
Import revised translations.

Change-Id: Ife515a41d11060032922c89eff125abcf0a99f87

13 years agoUse new TTS engine API in TTS settings
Bjorn Bringert [Fri, 11 Mar 2011 16:52:51 +0000 (16:52 +0000)]
Use new TTS engine API in TTS settings

Requires TTS engine API added in
change I7614ff788e11f897e87052f684f1b4938d539fb7

Bug: 4148725
Change-Id: I5f3fa3bbcbf4e62af23bb701bcb6e8e5d8511341

13 years agoam 0d3a7592: (-s ours) am 20a44118: am 76aa8fe0: am 4ba98d53: (-s ours) Import revise...
Eric Fischer [Thu, 14 Apr 2011 22:04:38 +0000 (15:04 -0700)]
am 0d3a7592: (-s ours) am 20a44118: am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations.  DO NOT MERGE

* commit '0d3a75923ea78119d58d5c2cbc1fb1ecdf73c5fb':
  Import revised translations.  DO NOT MERGE

13 years agoam 20a44118: am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations. DO...
Eric Fischer [Thu, 14 Apr 2011 21:27:34 +0000 (14:27 -0700)]
am 20a44118: am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations.  DO NOT MERGE

* commit '20a44118ddce65bcb1a86a38ab17d82083528930':
  Import revised translations.  DO NOT MERGE

13 years agoam 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:24:48 +0000 (14:24 -0700)]
am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations.  DO NOT MERGE

* commit '76aa8fe0663004a7b481a830cca87492bd9c7987':
  Import revised translations.  DO NOT MERGE

13 years agoam 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:20:01 +0000 (14:20 -0700)]
am 4ba98d53: (-s ours) Import revised translations.  DO NOT MERGE

* commit '4ba98d5381d89f5afd83f9ce4a5f1e666e7579e7':
  Import revised translations.  DO NOT MERGE

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:04:03 +0000 (14:04 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I64e7baff852f629d0281352be24fc54eadb48367

13 years agoA few tweaks to the battery history chart.
Dianne Hackborn [Thu, 14 Apr 2011 01:17:11 +0000 (18:17 -0700)]
A few tweaks to the battery history chart.

Change-Id: Id133267592acf7a979a625704d2d922a24f5ff41

13 years agoam 386185a3: am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code
Glenn Kasten [Wed, 13 Apr 2011 18:56:38 +0000 (11:56 -0700)]
am 386185a3: am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code

* commit '386185a3754535cd75c35091135b2933e39872bd':
  Bug 4167061 remove debug code

13 years agoam 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code
Glenn Kasten [Wed, 13 Apr 2011 18:51:59 +0000 (11:51 -0700)]
am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code

* commit '315b452c322f2eeeeb0ec946e31656ca93b8c0a7':
  Bug 4167061 remove debug code

13 years agoam 4f4ddaa8: Bug 4167061 remove debug code
Glenn Kasten [Wed, 13 Apr 2011 18:47:46 +0000 (11:47 -0700)]
am 4f4ddaa8: Bug 4167061 remove debug code

* commit '4f4ddaa823bfa7bd2fdff97338ff1839739925dd':
  Bug 4167061 remove debug code

13 years agoBug 4167061 remove debug code
Glenn Kasten [Wed, 13 Apr 2011 18:19:58 +0000 (11:19 -0700)]
Bug 4167061 remove debug code

Change-Id: I1a05b820030d503b4ae1a82789ad4607e46b43c0

13 years agoam a5babbb0: (-s ours) am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarify addit...
Simon Wilson [Tue, 12 Apr 2011 00:39:03 +0000 (17:39 -0700)]
am a5babbb0: (-s ours) am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage

* commit 'a5babbb092f7b65ccd78f0b7590a34b22412f2bd':
  DO NOT MERGE Clarify additional system update string length/usage

13 years agoam f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarify additional system update...
Simon Wilson [Tue, 12 Apr 2011 00:33:20 +0000 (17:33 -0700)]
am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage

* commit 'f927cccd795c75247bf6bfba881059d5e9c43fb5':
  DO NOT MERGE Clarify additional system update string length/usage

13 years agoam 2439b7c0: (-s ours) am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings...
Eric Fischer [Mon, 11 Apr 2011 21:28:21 +0000 (14:28 -0700)]
am 2439b7c0: (-s ours) am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations.  DO NOT MERGE" into gingerbread

* commit '2439b7c00d86fb490b48e2bc0927fd581bf59e0e':
  Reimport Settings translations.  DO NOT MERGE

13 years agoam 719e1e43: (-s ours) am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put...
Simon Wilson [Mon, 11 Apr 2011 21:28:20 +0000 (14:28 -0700)]
am 719e1e43: (-s ours) am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit '719e1e43173155cbe0d77298c3d1ca05f143048b':
  DO NOT MERGE Put additional update package names in config.xml

13 years agoam 1985e381: (-s ours) am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised...
Eric Fischer [Mon, 11 Apr 2011 21:28:18 +0000 (14:28 -0700)]
am 1985e381: (-s ours) am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations.  DO NOT MERGE"

* commit '1985e381cbcb817adc26f4f612f96583b692e397':
  Revert "Import revised translations.  DO NOT MERGE"

13 years agoam 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT...
Eric Fischer [Mon, 11 Apr 2011 21:24:30 +0000 (14:24 -0700)]
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations.  DO NOT MERGE" into gingerbread

* commit '84c90053751ae1bcb07a845f5ac9747a808198b1':
  Reimport Settings translations.  DO NOT MERGE

13 years agoam 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package...
Simon Wilson [Mon, 11 Apr 2011 21:24:28 +0000 (14:24 -0700)]
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit '2ca7add59f2437c4584029ba081bd4d222445ff9':
  DO NOT MERGE Put additional update package names in config.xml

13 years agoam 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations. DO NOT...
Eric Fischer [Mon, 11 Apr 2011 21:24:25 +0000 (14:24 -0700)]
am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations.  DO NOT MERGE"

* commit '6735ae141fee012409a2eaa0310538f3b0173263':
  Revert "Import revised translations.  DO NOT MERGE"

13 years agoam 37063d6a: DO NOT MERGE Clarify additional system update string length/usage
Simon Wilson [Mon, 11 Apr 2011 21:12:43 +0000 (14:12 -0700)]
am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage

* commit '37063d6adf9b472a8bb4bd58493517e04aafba95':
  DO NOT MERGE Clarify additional system update string length/usage

13 years agoam fc52971f: am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2
Glenn Kasten [Mon, 11 Apr 2011 19:49:00 +0000 (12:49 -0700)]
am fc52971f: am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit 'fc52971f7e0e4409d4a78686e23a5e330e559fb8':
  HDCP debugging in setting app part 2 of 2

13 years agoam b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2
Glenn Kasten [Mon, 11 Apr 2011 19:46:36 +0000 (12:46 -0700)]
am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit 'b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710':
  HDCP debugging in setting app part 2 of 2

13 years agoam 858fd9a0: HDCP debugging in setting app part 2 of 2
Glenn Kasten [Mon, 11 Apr 2011 19:43:22 +0000 (12:43 -0700)]
am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit '858fd9a0302c6d34781133137a048a9bf668632a':
  HDCP debugging in setting app part 2 of 2

13 years agoDO NOT MERGE Clarify additional system update string length/usage
Simon Wilson [Mon, 11 Apr 2011 19:38:21 +0000 (12:38 -0700)]
DO NOT MERGE Clarify additional system update string length/usage

Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49

13 years agoHDCP debugging in setting app part 2 of 2
Glenn Kasten [Mon, 11 Apr 2011 18:11:56 +0000 (11:11 -0700)]
HDCP debugging in setting app part 2 of 2

Change-Id: I931c50938526adce521a7bf02301aba75abaacaf

13 years agoMerge "Tolerate missing AccountManager resource, not just missing resource name"
Brian Carlstrom [Fri, 8 Apr 2011 17:28:37 +0000 (10:28 -0700)]
Merge "Tolerate missing AccountManager resource, not just missing resource name"

13 years agoRemove the deprecated things from Config.java. These havent been working since before...
Joe Onorato [Fri, 8 Apr 2011 01:41:13 +0000 (18:41 -0700)]
Remove the deprecated things from Config.java. These havent been working since before 1.0.

Change-Id: I88ea860fd6edf7c128cf1a201329f09428ab382c

13 years agoMerge "Import revised translations."
Eric Fischer [Thu, 7 Apr 2011 21:08:01 +0000 (14:08 -0700)]
Merge "Import revised translations."

13 years agoImport revised translations.
Eric Fischer [Thu, 7 Apr 2011 20:59:28 +0000 (13:59 -0700)]
Import revised translations.

Change-Id: I176df34d590daa670ac132759d7f4cb91e4b3747

13 years agoTolerate missing AccountManager resource, not just missing resource name
Brian Carlstrom [Mon, 14 Feb 2011 18:16:39 +0000 (10:16 -0800)]
Tolerate missing AccountManager resource, not just missing resource name

Change-Id: I29ceed33a9cc8e697bfd3226f6ec58291c36daae

13 years agoMerge "advanced settings"
Joe Onorato [Thu, 7 Apr 2011 01:45:33 +0000 (18:45 -0700)]
Merge "advanced settings"

13 years agoadvanced settings
Joe Onorato [Thu, 7 Apr 2011 01:26:20 +0000 (18:26 -0700)]
advanced settings

Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be

13 years agoam 94cdd67d: (-s ours) am 84edd9d5: am 8214c76e: Import revised translations. DO...
Eric Fischer [Wed, 6 Apr 2011 21:21:43 +0000 (14:21 -0700)]
am 94cdd67d: (-s ours) am 84edd9d5: am 8214c76e: Import revised translations.  DO NOT MERGE

* commit '94cdd67dcf67b5c25bc063d887bdb1e5864cd35d':
  Import revised translations.  DO NOT MERGE

13 years agoam 84edd9d5: am 8214c76e: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 21:19:10 +0000 (14:19 -0700)]
am 84edd9d5: am 8214c76e: Import revised translations.  DO NOT MERGE

* commit '84edd9d5281cb8e03ea31631aa232b8458136f32':
  Import revised translations.  DO NOT MERGE

13 years agoam 8214c76e: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 21:16:10 +0000 (14:16 -0700)]
am 8214c76e: Import revised translations.  DO NOT MERGE

* commit '8214c76e27de37a663cf8ce7a30091bf23c9be02':
  Import revised translations.  DO NOT MERGE

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 20:51:27 +0000 (13:51 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I5096f0341965e767187b8444f93804cad934ada9

13 years agoam b7185a54: (-s ours) am dfb78827: (-s ours) am 955ab98f: Import revised translation...
Eric Fischer [Tue, 5 Apr 2011 17:26:27 +0000 (10:26 -0700)]
am b7185a54: (-s ours) am dfb78827: (-s ours) am 955ab98f: Import revised translations.  DO NOT MERGE

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

13 years agoam dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 5 Apr 2011 00:42:55 +0000 (17:42 -0700)]
am dfb78827: (-s ours) am 955ab98f: Import revised translations.  DO NOT MERGE

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

13 years agoam fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 4 Apr 2011 21:43:04 +0000 (14:43 -0700)]
am fcb089c9: Merge "Reimport Settings translations.  DO NOT MERGE" into gingerbread

* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
  Reimport Settings translations.  DO NOT MERGE

13 years agoam ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml...
Simon Wilson [Mon, 4 Apr 2011 21:43:02 +0000 (14:43 -0700)]
am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
  DO NOT MERGE Put additional update package names in config.xml

13 years agoam b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
Eric Fischer [Mon, 4 Apr 2011 21:42:59 +0000 (14:42 -0700)]
am b4bd78f5: Revert "Import revised translations.  DO NOT MERGE"

* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
  Revert "Import revised translations.  DO NOT MERGE"

13 years agoam 955ab98f: Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 4 Apr 2011 19:21:25 +0000 (12:21 -0700)]
am 955ab98f: Import revised translations.  DO NOT MERGE

* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Reimport Settings translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 1 Apr 2011 23:52:28 +0000 (16:52 -0700)]
Merge "Reimport Settings translations.  DO NOT MERGE" into gingerbread

13 years agoMerge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
Simon Wilson [Fri, 1 Apr 2011 23:47:22 +0000 (16:47 -0700)]
Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

13 years agoReimport Settings translations. DO NOT MERGE
Eric Fischer [Fri, 1 Apr 2011 23:42:38 +0000 (16:42 -0700)]
Reimport Settings translations.  DO NOT MERGE

Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a

13 years agoRevert "Import revised translations. DO NOT MERGE"
Eric Fischer [Fri, 1 Apr 2011 23:12:35 +0000 (16:12 -0700)]
Revert "Import revised translations.  DO NOT MERGE"

This reverts commit 955ab98f030cd198d838bdff8768ff87a17be9a8.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404

13 years agoDO NOT MERGE Put additional update package names in config.xml
Simon Wilson [Fri, 1 Apr 2011 20:41:03 +0000 (13:41 -0700)]
DO NOT MERGE Put additional update package names in config.xml

Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a

13 years agoMerge "Fix LockScreen Settings on phones."
Jim Miller [Thu, 31 Mar 2011 20:24:19 +0000 (13:24 -0700)]
Merge "Fix LockScreen Settings on phones."

13 years agoFix LockScreen Settings on phones.
Jim Miller [Thu, 31 Mar 2011 04:16:48 +0000 (21:16 -0700)]
Fix LockScreen Settings on phones.

Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807

13 years agoam ebfc5e3e: (-s ours) am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support...
Park Sanghyun [Wed, 30 Mar 2011 23:40:49 +0000 (16:40 -0700)]
am ebfc5e3e: (-s ours) am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit 'ebfc5e3ed65d3d015b50372fb216782c4af7a3ac':
  DO NOT MERGE Add support for additional System Update menu item

13 years agoam 42f178d1: resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp
Kenny Root [Wed, 30 Mar 2011 23:38:52 +0000 (16:38 -0700)]
am 42f178d1: resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

* commit '42f178d10bcad0a8c04f20b2dfd2e3c28117a7cf':
  Settings: Improved UX when viewing open source license info.

13 years agoam 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System...
Park Sanghyun [Wed, 30 Mar 2011 22:29:48 +0000 (15:29 -0700)]
am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit '2b2959b32141e86a0de880ded77c3ef63a081e0f':
  DO NOT MERGE Add support for additional System Update menu item

13 years agoresolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp
Kenny Root [Wed, 30 Mar 2011 16:36:19 +0000 (09:36 -0700)]
resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58

13 years agoam e5da8565: DO NOT MERGE Add support for additional System Update menu item
Park Sanghyun [Wed, 30 Mar 2011 16:31:15 +0000 (09:31 -0700)]
am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
  DO NOT MERGE Add support for additional System Update menu item

13 years agoam f701fd1a: (-s ours) am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revise...
Eric Fischer [Tue, 29 Mar 2011 23:59:28 +0000 (16:59 -0700)]
am f701fd1a: (-s ours) am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations.  DO NOT MERGE

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

13 years agoam 7fceefa7: Merge "Settings: Improved UX when viewing open source license info."
Kenny Root [Tue, 29 Mar 2011 22:43:38 +0000 (15:43 -0700)]
am 7fceefa7: Merge "Settings: Improved UX when viewing open source license info."

* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
  Settings: Improved UX when viewing open source license info.

13 years agoMerge "Settings: Improved UX when viewing open source license info."
Kenny Root [Tue, 29 Mar 2011 22:03:25 +0000 (15:03 -0700)]
Merge "Settings: Improved UX when viewing open source license info."

13 years agoSettings: Improved UX when viewing open source license info.
Henrik Carlsson [Fri, 3 Sep 2010 09:08:19 +0000 (11:08 +0200)]
Settings: Improved UX when viewing open source license info.

Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.

Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6

13 years agoam 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations. DO...
Eric Fischer [Tue, 29 Mar 2011 21:19:44 +0000 (14:19 -0700)]
am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations.  DO NOT MERGE

* commit '573235d9a73efdf3af066e47803a6c24382e6979':
  Import revised translations.  DO NOT MERGE

13 years agoam 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:15:16 +0000 (14:15 -0700)]
am 142f4533: am 429687b9: (-s ours) Import revised translations.  DO NOT MERGE

* commit '142f453399a123a3f9c046f5cec626b7e7d6facd':
  Import revised translations.  DO NOT MERGE

13 years agoam 429687b9: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:07:12 +0000 (14:07 -0700)]
am 429687b9: (-s ours) Import revised translations.  DO NOT MERGE

* commit '429687b9ceace0d7fab9aa65c9d93e8f3eec93ba':
  Import revised translations.  DO NOT MERGE

13 years agoam 823a6ee9: am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate...
Jake Hamby [Tue, 29 Mar 2011 20:36:41 +0000 (13:36 -0700)]
am 823a6ee9: am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit '823a6ee9ec95e0278ae77b37392c873e86bfe071':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

13 years agoam e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and...
Jake Hamby [Tue, 29 Mar 2011 20:34:20 +0000 (13:34 -0700)]
am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit 'e9fdee0ed0ca2f2e0e83cda161906ca3a0a673a6':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 20:32:59 +0000 (13:32 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Id19c294af4493e0d47193ab3477d5c0a1c068669

13 years agoam 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices...
Jake Hamby [Tue, 29 Mar 2011 20:31:54 +0000 (13:31 -0700)]
am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit '81cb6be834f4604f6b58d8516f2b8e12620a3d16':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

13 years agoMerge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honey...
Jake Hamby [Tue, 29 Mar 2011 20:28:48 +0000 (13:28 -0700)]
Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

13 years agoam c091a927: (-s ours) am 388fc081: am 3b4b91d4: Import revised translations. DO...
Eric Fischer [Tue, 29 Mar 2011 19:28:04 +0000 (12:28 -0700)]
am c091a927: (-s ours) am 388fc081: am 3b4b91d4: Import revised translations.  DO NOT MERGE

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

13 years agoam 388fc081: am 3b4b91d4: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 19:24:35 +0000 (12:24 -0700)]
am 388fc081: am 3b4b91d4: Import revised translations.  DO NOT MERGE

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

13 years agoam 3b4b91d4: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 19:19:35 +0000 (12:19 -0700)]
am 3b4b91d4: Import revised translations.  DO NOT MERGE

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

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 19:00:36 +0000 (12:00 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37