OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoam cdc2c553: Add new dev settings to debug hardware layers
Romain Guy [Mon, 6 Aug 2012 21:56:12 +0000 (14:56 -0700)]
am cdc2c553: Add new dev settings to debug hardware layers

* commit 'cdc2c5534f8815cf0fef3ece4b95c25a0423f461':
  Add new dev settings to debug hardware layers

11 years agoAdd new dev settings to debug hardware layers
Romain Guy [Mon, 6 Aug 2012 21:52:52 +0000 (14:52 -0700)]
Add new dev settings to debug hardware layers

Change-Id: I2668552d70911a90e173efdf75bc44139ed394c8

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Mon, 6 Aug 2012 20:25:50 +0000 (13:25 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I577fb5bc77b6df44adec589f76d0c2aecdd8eba0

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 6 Aug 2012 13:29:17 +0000 (06:29 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 21:44:07 +0000 (14:44 -0700)]
am 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE

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

11 years agoam bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 21:41:47 +0000 (14:41 -0700)]
am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE

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

11 years agoam c868a4ca: Import translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 21:39:27 +0000 (14:39 -0700)]
am c868a4ca: Import translations. DO NOT MERGE

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

11 years agoam 3eee86b8: Import translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 21:38:01 +0000 (14:38 -0700)]
am 3eee86b8: Import translations. DO NOT MERGE

* commit '3eee86b8d7bc175e1e83269afc5c2c5441681a50':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 20:44:19 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 20:41:54 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 104ab231: Merge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev
Przemyslaw Szczepaniak [Fri, 3 Aug 2012 16:19:53 +0000 (09:19 -0700)]
am 104ab231: Merge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev

* commit '104ab231e5b8541b84460f32d30578755e60a765':
  Fixes list of TTS voices after changing voice data

11 years agoMerge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev
Przemyslaw Szczepaniak [Fri, 3 Aug 2012 16:17:35 +0000 (09:17 -0700)]
Merge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev

11 years agoFixes list of TTS voices after changing voice data
Przemyslaw Szczepaniak [Fri, 3 Aug 2012 12:53:19 +0000 (13:53 +0100)]
Fixes list of TTS voices after changing voice data

Added one BroadcastListener that listens for TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED intents.
If it gets one, it will call TextToSpeech.Engine.ACTION_CHECK_TTS_DATA to update list of TTS voices.
It expects TTS engine to broadcast TTS_DATA_INSTALLED also when removing voice data.

In order to catch changes done when user sits in Text-to-speech output main activity,
TextToSpeech.Engine.ACTION_CHECK_TTS_DATA is called on start of tts engine config fragment.

Change-Id: Ic1e299ea3ffc45d938083f1ab5b2bf101fe25f26

11 years agoam b54b45d9: Merge "Re-enable dreams: Settings" into jb-mr1-dev
John Spurlock [Fri, 3 Aug 2012 15:55:53 +0000 (08:55 -0700)]
am b54b45d9: Merge "Re-enable dreams: Settings" into jb-mr1-dev

* commit 'b54b45d93ba378ef91e551f1073888de55b9e982':
  Re-enable dreams: Settings

11 years agoMerge "Re-enable dreams: Settings" into jb-mr1-dev
John Spurlock [Fri, 3 Aug 2012 15:53:21 +0000 (08:53 -0700)]
Merge "Re-enable dreams: Settings" into jb-mr1-dev

11 years agoam 6e380d08: am 3d43f9c8: am ca511a81: Fix appwidget bind dialog
Michael Jurka [Fri, 3 Aug 2012 05:34:13 +0000 (22:34 -0700)]
am 6e380d08: am 3d43f9c8: am ca511a81: Fix appwidget bind dialog

* commit '6e380d0865e397e251f516c7ccefedf26ed8801d':
  Fix appwidget bind dialog

11 years agoam 3d43f9c8: am ca511a81: Fix appwidget bind dialog
Michael Jurka [Fri, 3 Aug 2012 05:31:34 +0000 (22:31 -0700)]
am 3d43f9c8: am ca511a81: Fix appwidget bind dialog

* commit '3d43f9c8aa2b00d894577e5b6dfe3ffcdfc9d871':
  Fix appwidget bind dialog

11 years agoam ca511a81: Fix appwidget bind dialog
Michael Jurka [Fri, 3 Aug 2012 05:29:23 +0000 (22:29 -0700)]
am ca511a81: Fix appwidget bind dialog

* commit 'ca511a8115962be7f598deb20aa47793db6d06f7':
  Fix appwidget bind dialog

11 years agoFix appwidget bind dialog
Michael Jurka [Fri, 3 Aug 2012 01:36:42 +0000 (18:36 -0700)]
Fix appwidget bind dialog

Bug: 6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12

11 years agoRe-enable dreams: Settings
John Spurlock [Tue, 31 Jul 2012 12:24:27 +0000 (08:24 -0400)]
Re-enable dreams: Settings

Re-arrange settings and captions for dreams.  Activation on sleep
and activation on dock now independent. Sleep activation defaults to off,
dock activation defaults to on (replacing dock mode).

Also use dream manager service for testing dream preference, and properly
disable preferences if both dream activations are disabled.

Change-Id: I76f5ba115c7678826a09077dd393acc55c2bca26
Bug: 6921930

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 2 Aug 2012 18:27:20 +0000 (11:27 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic1a68162e9f5c0d65ef87216a47d17a7c4b52c27

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 2 Aug 2012 15:18:19 +0000 (08:18 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE
Ying Wang [Wed, 1 Aug 2012 22:34:00 +0000 (15:34 -0700)]
am 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE

* commit '6a20ce5e515141b0934bd4093dbad53c14a19a6e':
  Import translations. DO NOT MERGE

11 years agoam 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE
Ying Wang [Wed, 1 Aug 2012 22:30:23 +0000 (15:30 -0700)]
am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE

* commit '91840c02361af8157b0c0395fafe704edab2e498':
  Import translations. DO NOT MERGE

11 years agoam 4c9e26b0: Import translations. DO NOT MERGE
Ying Wang [Wed, 1 Aug 2012 22:29:02 +0000 (15:29 -0700)]
am 4c9e26b0: Import translations. DO NOT MERGE

* commit '4c9e26b0d2ebee28027de0703fbdc9195166ba72':
  Import translations. DO NOT MERGE

11 years agoam d7ae05db: Import translations. DO NOT MERGE
Ying Wang [Wed, 1 Aug 2012 22:28:32 +0000 (15:28 -0700)]
am d7ae05db: Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 1 Aug 2012 21:15:14 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 1 Aug 2012 21:13:16 +0000 (14:13 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam c70f5483: Reset the priority on unbond
Ravi Nagarajan [Wed, 1 Aug 2012 07:44:12 +0000 (00:44 -0700)]
am c70f5483: Reset the priority on unbond

* commit 'c70f5483553f5ff2bddc289ea8b7741bc81c9fbf':
  Reset the priority on unbond

11 years agoam b45e3c8f: Fix for When Hf is rejected the device should initiate A2dp if a2dp...
Swaminatha Balaji [Wed, 1 Aug 2012 07:44:09 +0000 (00:44 -0700)]
am b45e3c8f: Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled

* commit 'b45e3c8fe9c08851800a6afa362d975944c0cd46':
  Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled

11 years agoam 802956ec: Add dev to cached dev list if entry is missing before auto connect
Ganesh Ganapathi Batta [Wed, 1 Aug 2012 07:44:07 +0000 (00:44 -0700)]
am 802956ec: Add dev to cached dev list if entry is missing before auto connect

* commit '802956ec9b22464ed327c0c2cbc59f6b6a309c88':
  Add dev to cached dev list if entry is missing before auto connect

11 years agoReset the priority on unbond
Ravi Nagarajan [Fri, 29 Jun 2012 13:54:16 +0000 (19:24 +0530)]
Reset the priority on unbond

Change-Id: I67b68bd70b947177218e0b908b79ebb9de9f45a8

11 years agoFix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
Swaminatha Balaji [Mon, 25 Jun 2012 11:04:41 +0000 (04:04 -0700)]
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled

Change-Id: I0716782a5308cc45297a30d0a7371286c75bfa52

11 years agoAdd dev to cached dev list if entry is missing before auto connect
Ganesh Ganapathi Batta [Thu, 14 Jun 2012 07:05:06 +0000 (00:05 -0700)]
Add dev to cached dev list if entry is missing before auto connect

Fix for BLTH01482218

Change-Id: I7d5cfad3eff872b5eb0b0c71804f25f3c3334557

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 31 Jul 2012 22:04:02 +0000 (15:04 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Icc9358e5fffbcb4af923a9f66b59b15d6113fade

11 years agoam dbe1a24d: am f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge
The Android Open Source Project [Tue, 31 Jul 2012 21:52:52 +0000 (14:52 -0700)]
am dbe1a24d: am f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'dbe1a24d3595bff9b911b46f34e12a18e55cab74':

11 years agoam f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge
The Android Open Source Project [Tue, 31 Jul 2012 21:51:08 +0000 (14:51 -0700)]
am f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'f6162c80cf048fe710f5cc0502fcfc052ff98385':

11 years agoReconcile with jb-mr0-release - do not merge
The Android Open Source Project [Tue, 31 Jul 2012 21:48:53 +0000 (14:48 -0700)]
Reconcile with jb-mr0-release - do not merge

Change-Id: If5252c45f4163409ab8375e27cb13f3f06a237b6

11 years agomerge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 31 Jul 2012 21:07:44 +0000 (14:07 -0700)]
merge in jb-mr0-release history after reset to jb-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 31 Jul 2012 14:35:31 +0000 (07:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam e2d5699d: am 9691c1e6: (-s ours) am 723bdf1e: Import translations. DO NOT MERGE
Ying Wang [Mon, 30 Jul 2012 22:12:24 +0000 (15:12 -0700)]
am e2d5699d: am 9691c1e6: (-s ours) am 723bdf1e: Import translations. DO NOT MERGE

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

11 years agoam df61ddc9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Ying Wang [Mon, 30 Jul 2012 22:10:37 +0000 (15:10 -0700)]
am df61ddc9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam 9691c1e6: (-s ours) am 723bdf1e: Import translations. DO NOT MERGE
Ying Wang [Mon, 30 Jul 2012 22:09:41 +0000 (15:09 -0700)]
am 9691c1e6: (-s ours) am 723bdf1e: Import translations. DO NOT MERGE

* commit '9691c1e646b143690476724b1d7f8dc788cfe00f':
  Import translations. DO NOT MERGE

11 years agoam 723bdf1e: Import translations. DO NOT MERGE
Ying Wang [Mon, 30 Jul 2012 22:06:58 +0000 (15:06 -0700)]
am 723bdf1e: Import translations. DO NOT MERGE

* commit '723bdf1ec561d211b45f20546e6938e68feebf39':
  Import translations. DO NOT MERGE

11 years agoReconcile with jb-mr1-release
The Android Open Source Project [Mon, 30 Jul 2012 22:05:14 +0000 (15:05 -0700)]
Reconcile with jb-mr1-release

Change-Id: I748fdd61c5644211f2406b42eefa521e4d7ed2d7

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Ying Wang [Mon, 30 Jul 2012 22:04:58 +0000 (15:04 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam c9976592: am a62d7893: Reconcile with jb-mr0-release jb-release
The Android Open Source Project [Mon, 30 Jul 2012 21:47:35 +0000 (14:47 -0700)]
am c9976592: am a62d7893: Reconcile with jb-mr0-release jb-release

* commit 'c99765925dfa0e2e08861a71ea1c7d103e6080d0':

11 years agoam a62d7893: Reconcile with jb-mr0-release jb-release
The Android Open Source Project [Mon, 30 Jul 2012 21:46:08 +0000 (14:46 -0700)]
am a62d7893: Reconcile with jb-mr0-release jb-release

* commit 'a62d7893891d044248553762cd34fe89dd2c7cd6':

11 years agoReconcile with jb-mr0-release jb-release
The Android Open Source Project [Mon, 30 Jul 2012 21:44:42 +0000 (14:44 -0700)]
Reconcile with jb-mr0-release jb-release

Change-Id: I1e66be92b8c13756b702c251c8b8f93bc8b07a83

11 years agoImport translations. DO NOT MERGE
Ying Wang [Mon, 30 Jul 2012 21:26:06 +0000 (14:26 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Ying Wang [Mon, 30 Jul 2012 20:25:03 +0000 (13:25 -0700)]
Import translations. DO NOT MERGE

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

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 30 Jul 2012 16:46:10 +0000 (09:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam e93bc70c: am dd4dd50f: Merge "Fix DNS hint in settings" into jb-mr1-dev
Irfan Sheriff [Mon, 30 Jul 2012 05:37:13 +0000 (22:37 -0700)]
am e93bc70c: am dd4dd50f: Merge "Fix DNS hint in settings" into jb-mr1-dev

* commit 'e93bc70c00a9f916e7dce7c706eba9e91caee3c3':
  Fix DNS hint in settings

11 years agoam dd4dd50f: Merge "Fix DNS hint in settings" into jb-mr1-dev
Irfan Sheriff [Mon, 30 Jul 2012 05:33:37 +0000 (22:33 -0700)]
am dd4dd50f: Merge "Fix DNS hint in settings" into jb-mr1-dev

* commit 'dd4dd50fe195d1642b67918e0e5ec83be9ee354d':
  Fix DNS hint in settings

11 years agoMerge "Fix DNS hint in settings" into jb-mr1-dev
Irfan Sheriff [Mon, 30 Jul 2012 05:30:46 +0000 (22:30 -0700)]
Merge "Fix DNS hint in settings" into jb-mr1-dev

11 years agoFix DNS hint in settings
Irfan Sheriff [Mon, 30 Jul 2012 02:18:03 +0000 (19:18 -0700)]
Fix DNS hint in settings

Change-Id: I382dbd60c2956a53a77547744790c33e93ce8404

11 years agoam aecf1901: (-s ours) am fdc600a4: am 270a5503: (-s ours) am eaeb8b61: Import transl...
Ying Wang [Fri, 27 Jul 2012 23:24:37 +0000 (16:24 -0700)]
am aecf1901: (-s ours) am fdc600a4: am 270a5503: (-s ours) am eaeb8b61: Import translations. DO NOT MERGE

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

11 years agoam fdc600a4: am 270a5503: (-s ours) am eaeb8b61: Import translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 22:55:43 +0000 (15:55 -0700)]
am fdc600a4: am 270a5503: (-s ours) am eaeb8b61: Import translations. DO NOT MERGE

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

11 years agoam 270a5503: (-s ours) am eaeb8b61: Import translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 22:51:10 +0000 (15:51 -0700)]
am 270a5503: (-s ours) am eaeb8b61: Import translations. DO NOT MERGE

* commit '270a55034107d16dc993b61871314a306cb03439':
  Import translations. DO NOT MERGE

11 years agoam eaeb8b61: Import translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 22:46:02 +0000 (15:46 -0700)]
am eaeb8b61: Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 19:30:02 +0000 (12:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 19:25:46 +0000 (12:25 -0700)]
Import translations. DO NOT MERGE

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

11 years agomerge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Fri, 27 Jul 2012 00:49:58 +0000 (17:49 -0700)]
merge in jb-mr0-release history after reset to jb-dev

11 years agoam ff1e3f31: am 09f2f5af: am 2d018a8b: am 07841668: Merge "Move Google-apps specific...
Amith Yamasani [Thu, 26 Jul 2012 23:18:35 +0000 (16:18 -0700)]
am ff1e3f31: am 09f2f5af: am 2d018a8b: am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev

* commit 'ff1e3f3111f8fc3256e3abe5ab96522b90e6c099':
  Move Google-apps specific location settings to a Google package

11 years agoam 98024d99: (-s ours) am a7bb6922: am afc96c1b: (-s ours) am 4e53a0cb: Import transl...
Ying Wang [Thu, 26 Jul 2012 23:18:34 +0000 (16:18 -0700)]
am 98024d99: (-s ours) am a7bb6922: am afc96c1b: (-s ours) am 4e53a0cb: Import translations. DO NOT MERGE

* commit '98024d99fcb774094d8fab44c89e19ff526f7548':
  Import translations. DO NOT MERGE

11 years agoam 09f2f5af: am 2d018a8b: am 07841668: Merge "Move Google-apps specific location...
Amith Yamasani [Thu, 26 Jul 2012 23:15:23 +0000 (16:15 -0700)]
am 09f2f5af: am 2d018a8b: am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev

* commit '09f2f5afc1f6e3795dd9d361023e908bfabd6f2f':
  Move Google-apps specific location settings to a Google package

11 years agoam a7bb6922: am afc96c1b: (-s ours) am 4e53a0cb: Import translations. DO NOT MERGE
Ying Wang [Thu, 26 Jul 2012 23:15:22 +0000 (16:15 -0700)]
am a7bb6922: am afc96c1b: (-s ours) am 4e53a0cb: Import translations. DO NOT MERGE

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

11 years agoam 2d018a8b: am 07841668: Merge "Move Google-apps specific location settings to a...
Amith Yamasani [Thu, 26 Jul 2012 23:12:51 +0000 (16:12 -0700)]
am 2d018a8b: am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev

* commit '2d018a8b0d2f0a7e7c3ee9ea2d9ba7df3a161604':
  Move Google-apps specific location settings to a Google package

11 years agoam afc96c1b: (-s ours) am 4e53a0cb: Import translations. DO NOT MERGE
Ying Wang [Thu, 26 Jul 2012 23:12:50 +0000 (16:12 -0700)]
am afc96c1b: (-s ours) am 4e53a0cb: Import translations. DO NOT MERGE

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

11 years agoam 07841668: Merge "Move Google-apps specific location settings to a Google package...
Amith Yamasani [Thu, 26 Jul 2012 23:07:19 +0000 (16:07 -0700)]
am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev

* commit '078416689807e49c8b6750b9e3cc8a0e9ca3a2a1':
  Move Google-apps specific location settings to a Google package

11 years agoam 4e53a0cb: Import translations. DO NOT MERGE
Ying Wang [Thu, 26 Jul 2012 23:07:17 +0000 (16:07 -0700)]
am 4e53a0cb: Import translations. DO NOT MERGE

* commit '4e53a0cbdc56fce1a7fcf94c83d4a0f70ffd6920':
  Import translations. DO NOT MERGE

11 years agoMerge "Move Google-apps specific location settings to a Google package" into jb-dev
Amith Yamasani [Thu, 26 Jul 2012 22:15:22 +0000 (15:15 -0700)]
Merge "Move Google-apps specific location settings to a Google package" into jb-dev

11 years agoImport translations. DO NOT MERGE
Ying Wang [Thu, 26 Jul 2012 22:15:23 +0000 (15:15 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Ying Wang [Thu, 26 Jul 2012 22:11:52 +0000 (15:11 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMove Google-apps specific location settings to a Google package
Amith Yamasani [Thu, 26 Jul 2012 01:28:51 +0000 (18:28 -0700)]
Move Google-apps specific location settings to a Google package

Bug: 6882764

This removes the Google specific checkbox and adds a master toggle
for location providers which turns both providers on/off when
toggled.

Change-Id: I2a7af0953902bfd6f4b221725dc2d838bb3d0ce4

11 years agoam a8c28134: (-s ours) am f35b013b: am 7717e194: (-s ours) am 7021c6e6: (-s ours...
Ying Wang [Thu, 26 Jul 2012 15:15:18 +0000 (08:15 -0700)]
am a8c28134: (-s ours) am f35b013b: am 7717e194: (-s ours) am 7021c6e6: (-s ours) am c31f6b23: Import translations. DO NOT MERGE

* commit 'a8c281347d453b9abba10d91a86ee8d8c6725690':

11 years agoam b1fcdd60: (-s ours) am 36166474: Merge "Import translations. DO NOT MERGE"
Ying Wang [Thu, 26 Jul 2012 15:15:17 +0000 (08:15 -0700)]
am b1fcdd60: (-s ours) am 36166474: Merge "Import translations. DO NOT MERGE"

* commit 'b1fcdd606d63fa43dc6a0aeeca13e3784cfcbb6f':

11 years agoam 1647b853: am eca0eee0: Merge "Test getAllCellInfo and onCellInfoChanged."
Wink Saville [Thu, 26 Jul 2012 15:15:13 +0000 (08:15 -0700)]
am 1647b853: am eca0eee0: Merge "Test getAllCellInfo and onCellInfoChanged."

* commit '1647b853a81d43a1362c00b48b292d7249c411ba':

11 years agoam ab0e52b0: am 0cd75608: Merge "Use updated WifiManager API"
Irfan Sheriff [Thu, 26 Jul 2012 15:15:12 +0000 (08:15 -0700)]
am ab0e52b0: am 0cd75608: Merge "Use updated WifiManager API"

* commit 'ab0e52b08b43d382688fabdf0216b6a7a7a4e5ce':

11 years agoam f35b013b: am 7717e194: (-s ours) am 7021c6e6: (-s ours) am c31f6b23: Import transl...
Ying Wang [Thu, 26 Jul 2012 15:08:49 +0000 (08:08 -0700)]
am f35b013b: am 7717e194: (-s ours) am 7021c6e6: (-s ours) am c31f6b23: Import translations. DO NOT MERGE

* commit 'f35b013beb67159301a6c666093a099e655e66f0':

11 years agoam 36166474: Merge "Import translations. DO NOT MERGE"
Ying Wang [Thu, 26 Jul 2012 15:08:47 +0000 (08:08 -0700)]
am 36166474: Merge "Import translations. DO NOT MERGE"

* commit '36166474885c4440423d4d3e6c2d9be0bc04ff0c':
  Import translations. DO NOT MERGE

11 years agoam eca0eee0: Merge "Test getAllCellInfo and onCellInfoChanged."
Wink Saville [Thu, 26 Jul 2012 15:08:46 +0000 (08:08 -0700)]
am eca0eee0: Merge "Test getAllCellInfo and onCellInfoChanged."

* commit 'eca0eee041b866691bb5582665e5519903520aeb':
  Test getAllCellInfo and onCellInfoChanged.

11 years agoam 0cd75608: Merge "Use updated WifiManager API"
Irfan Sheriff [Thu, 26 Jul 2012 15:08:44 +0000 (08:08 -0700)]
am 0cd75608: Merge "Use updated WifiManager API"

* commit '0cd75608c0dc6f4a33e8ff944478945083430394':
  Use updated WifiManager API

12 years agoam 7717e194: (-s ours) am 7021c6e6: (-s ours) am c31f6b23: Import translations. DO...
Ying Wang [Thu, 26 Jul 2012 06:05:21 +0000 (23:05 -0700)]
am 7717e194: (-s ours) am 7021c6e6: (-s ours) am c31f6b23: Import translations. DO NOT MERGE

* commit '7717e194ce281a57c72628c5fcb51d9365fb5c7f':
  Import translations. DO NOT MERGE

12 years agoam 7021c6e6: (-s ours) am c31f6b23: Import translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 22:09:39 +0000 (15:09 -0700)]
am 7021c6e6: (-s ours) am c31f6b23: Import translations. DO NOT MERGE

* commit '7021c6e6df25fc2d100d8351be0eab1605c1693d':
  Import translations. DO NOT MERGE

12 years agoam c31f6b23: Import translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 22:06:15 +0000 (15:06 -0700)]
am c31f6b23: Import translations. DO NOT MERGE

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

12 years agoMerge "Import translations. DO NOT MERGE"
Ying Wang [Wed, 25 Jul 2012 22:04:20 +0000 (15:04 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 21:20:30 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 21:17:08 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE

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

12 years agoMerge "Test getAllCellInfo and onCellInfoChanged."
Wink Saville [Wed, 25 Jul 2012 21:11:58 +0000 (14:11 -0700)]
Merge "Test getAllCellInfo and onCellInfoChanged."

12 years agoMerge "Use updated WifiManager API"
Irfan Sheriff [Wed, 25 Jul 2012 19:25:42 +0000 (12:25 -0700)]
Merge "Use updated WifiManager API"

12 years agoMerge "Make Settings PercentageBar RTL aware"
Fabrice Di Meglio [Wed, 25 Jul 2012 18:26:41 +0000 (11:26 -0700)]
Merge "Make Settings PercentageBar RTL aware"

12 years agoMerge "Make Settings app aware of layout direction"
Fabrice Di Meglio [Wed, 25 Jul 2012 18:21:45 +0000 (11:21 -0700)]
Merge "Make Settings app aware of layout direction"

12 years agoUse updated WifiManager API
Irfan Sheriff [Tue, 10 Jul 2012 18:42:55 +0000 (11:42 -0700)]
Use updated WifiManager API

Change-Id: Ia02fc8a7eafa84fa4eddeeefafa7fecaac82903e

12 years agoam 5bc4bb20: (-s ours) am 54199540: Import translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 05:05:54 +0000 (22:05 -0700)]
am 5bc4bb20: (-s ours) am 54199540: Import translations. DO NOT MERGE

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

12 years agoam 54199540: Import translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 05:01:08 +0000 (22:01 -0700)]
am 54199540: Import translations. DO NOT MERGE

* commit '54199540b1d07af1a71e10ab096493245ed5fdbd':
  Import translations. DO NOT MERGE

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 25 Jul 2012 03:23:17 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMake Settings PercentageBar RTL aware
Fabrice Di Meglio [Wed, 25 Jul 2012 00:31:22 +0000 (17:31 -0700)]
Make Settings PercentageBar RTL aware

- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I7c4c4207650fa4442f6eb20f2195101e23b1b0b2

12 years agoMake Settings app aware of layout direction
Fabrice Di Meglio [Fri, 20 Jul 2012 02:25:50 +0000 (19:25 -0700)]
Make Settings app aware of layout direction

- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I696c0f66a16640af767da3c05b5d300fd2284ecb

12 years agoImport translations. DO NOT MERGE
Ying Wang [Tue, 24 Jul 2012 19:42:50 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE

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