OSDN Git Service

android-x86/packages-apps-Settings.git
12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 13 Aug 2012 20:30:49 +0000 (13:30 -0700)]
Import translations. DO NOT MERGE

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

12 years agoam 032aa5a5: am 32630395: Use UserManager instead of PackageManager for user management
Amith Yamasani [Sun, 12 Aug 2012 04:59:11 +0000 (21:59 -0700)]
am 032aa5a5: am 32630395: Use UserManager instead of PackageManager for user management

* commit '032aa5a5ba22a5c46adc0fda210689c25e0e2bb5':
  Use UserManager instead of PackageManager for user management

12 years agoam 32630395: Use UserManager instead of PackageManager for user management
Amith Yamasani [Sun, 12 Aug 2012 04:57:51 +0000 (21:57 -0700)]
am 32630395: Use UserManager instead of PackageManager for user management

* commit '32630395eb7dd8401f344599640c8bcf1e289bb0':
  Use UserManager instead of PackageManager for user management

12 years agoUse UserManager instead of PackageManager for user management
Amith Yamasani [Sat, 11 Aug 2012 02:31:39 +0000 (19:31 -0700)]
Use UserManager instead of PackageManager for user management

Show Accounts in secondary settings
Move Users & restrictions to Device section

Change-Id: Idcd7ed44801fe92c847cff81d11f3d6f6d06ba81

12 years agoam 424111dd: (-s ours) am 5ef3293e: Import translations. DO NOT MERGE
Baligh Uddin [Fri, 10 Aug 2012 22:38:44 +0000 (15:38 -0700)]
am 424111dd: (-s ours) am 5ef3293e: Import translations. DO NOT MERGE

* commit '424111dd2a01337605b65c5ae7c67f19d18bc5e7':
  Import translations. DO NOT MERGE

12 years agoam 5ef3293e: Import translations. DO NOT MERGE
Baligh Uddin [Fri, 10 Aug 2012 22:36:48 +0000 (15:36 -0700)]
am 5ef3293e: Import translations. DO NOT MERGE

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

12 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 10 Aug 2012 22:34:31 +0000 (15:34 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 10 Aug 2012 18:24:00 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 10 Aug 2012 18:21:05 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE

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

12 years agoam 9698d362: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 10 Aug 2012 15:55:54 +0000 (08:55 -0700)]
am 9698d362: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9698d3624c5e66cbff3c89e56a1388b6b2be9c1d':

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 10 Aug 2012 15:53:55 +0000 (08:53 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I73e4c2917ac2df4341096582c1a1d1eab7df8a66

12 years agoam 06649d02: am 923187a1: Keep speech rate dialog after rotate
Przemyslaw Szczepaniak [Fri, 10 Aug 2012 14:18:23 +0000 (07:18 -0700)]
am 06649d02: am 923187a1: Keep speech rate dialog after rotate

* commit '06649d02b2d6e3f147a1082c7538682f97e64a0b':
  Keep speech rate dialog after rotate

12 years agoam 923187a1: Keep speech rate dialog after rotate
Przemyslaw Szczepaniak [Fri, 10 Aug 2012 14:17:36 +0000 (07:17 -0700)]
am 923187a1: Keep speech rate dialog after rotate

* commit '923187a159cb0c192a2f978a6bf1dd51275ea916':
  Keep speech rate dialog after rotate

12 years agoKeep speech rate dialog after rotate
Przemyslaw Szczepaniak [Thu, 9 Aug 2012 11:50:41 +0000 (12:50 +0100)]
Keep speech rate dialog after rotate

It also adds some missing @Override

Bug: 5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693

12 years agoam 2dc3d551: (-s ours) am 658f909d: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Fri, 10 Aug 2012 02:53:46 +0000 (19:53 -0700)]
am 2dc3d551: (-s ours) am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

12 years agoam 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 10 Aug 2012 02:52:40 +0000 (19:52 -0700)]
am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '658f909d711b1598ec6f49447679569f0bc19c15':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 10 Aug 2012 02:50:14 +0000 (19:50 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

12 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 10 Aug 2012 02:49:10 +0000 (19:49 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoam 6a88ef4b: am aae0659e: Setting to turn off power optimizations
Irfan Sheriff [Thu, 9 Aug 2012 23:06:33 +0000 (16:06 -0700)]
am 6a88ef4b: am aae0659e: Setting to turn off power optimizations

* commit '6a88ef4bd233591cfdd3cfa5cee9af61483242eb':
  Setting to turn off power optimizations

12 years agoam aae0659e: Setting to turn off power optimizations
Irfan Sheriff [Thu, 9 Aug 2012 22:58:13 +0000 (15:58 -0700)]
am aae0659e: Setting to turn off power optimizations

* commit 'aae0659e18e013401b83717a83ec25393d4ba626':
  Setting to turn off power optimizations

12 years agoSetting to turn off power optimizations
Irfan Sheriff [Thu, 9 Aug 2012 22:09:10 +0000 (15:09 -0700)]
Setting to turn off power optimizations

Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 9 Aug 2012 19:42:04 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 9 Aug 2012 19:39:18 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE

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

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 9 Aug 2012 16:29:59 +0000 (09:29 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agoam aeb7b571: am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
John Spurlock [Thu, 9 Aug 2012 13:22:56 +0000 (06:22 -0700)]
am aeb7b571: am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev

* commit 'aeb7b5710593b982d2306eb2006b6ae153655141':
  Fix NPE in Dreams settings.

12 years agoam eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
John Spurlock [Thu, 9 Aug 2012 13:20:50 +0000 (06:20 -0700)]
am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev

* commit 'eaffad37c19ac5859539c232a7dc8d2f47159f61':
  Fix NPE in Dreams settings.

12 years agoMerge "Fix NPE in Dreams settings." into jb-mr1-dev
John Spurlock [Thu, 9 Aug 2012 13:18:45 +0000 (06:18 -0700)]
Merge "Fix NPE in Dreams settings." into jb-mr1-dev

12 years agoFix NPE in Dreams settings.
John Spurlock [Thu, 9 Aug 2012 13:03:48 +0000 (09:03 -0400)]
Fix NPE in Dreams settings.

Handle the null case to avoid crashing Settings.

Change-Id: I257b766370bd604e0af5b332241619258fb732c9

12 years agoam 8aa63452: (-s ours) am 702cdf4c: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Thu, 9 Aug 2012 03:05:51 +0000 (20:05 -0700)]
am 8aa63452: (-s ours) am 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '8aa634529cfeda5d375a2a541038b8b7976f8a85':
  Import translations. DO NOT MERGE

12 years agoam 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 9 Aug 2012 03:04:24 +0000 (20:04 -0700)]
am 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '702cdf4c9a84fd9bcb258cdb26c57fd8d50961d6':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 9 Aug 2012 03:02:24 +0000 (20:02 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

12 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 9 Aug 2012 03:01:23 +0000 (20:01 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoam 17d915b7: am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android...
Jean-Baptiste Queru [Wed, 8 Aug 2012 22:11:26 +0000 (15:11 -0700)]
am 17d915b7: am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."

* commit '17d915b7fdc4527710022ed3dd6c48bc03b8157b':
  Add support for SE Android to the Settings app.

12 years agoam 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Setti...
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:09:11 +0000 (14:09 -0700)]
am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."

* commit '66321184570da9e93c089b2a1065fc3d4c7230a3':
  Add support for SE Android to the Settings app.

12 years agoam 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:06:31 +0000 (14:06 -0700)]
am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."

* commit '7526636406087666d005d389ddc0cdacd79499fd':
  Add support for SE Android to the Settings app.

12 years agoam 5d72b272: Merge "Add support for SE Android to the Settings app."
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:11 +0000 (14:04 -0700)]
am 5d72b272: Merge "Add support for SE Android to the Settings app."

* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Aug 2012 20:44:29 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Aug 2012 20:40:29 +0000 (13:40 -0700)]
Import translations. DO NOT MERGE

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

12 years agoMerge "Add support for SE Android to the Settings app."
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:19:26 +0000 (13:19 -0700)]
Merge "Add support for SE Android to the Settings app."

12 years agoam a01ab9e5: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 8 Aug 2012 15:21:52 +0000 (08:21 -0700)]
am a01ab9e5: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a01ab9e5763b16e89239f40a56edfee5f0c8fa75':

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 8 Aug 2012 15:18:04 +0000 (08:18 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I6809fcad464f90b62407ba5e19da9a226ca3be83

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 8 Aug 2012 13:47:58 +0000 (06:47 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agoam 83457dd7: am a1f463cb: Merge "Remove Profile Auto connection specific logic" into...
Matthew Xie [Wed, 8 Aug 2012 07:37:48 +0000 (00:37 -0700)]
am 83457dd7: am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev

* commit '83457dd79bb481afe9a1ad16259802b0a09fe68a':
  Remove Profile Auto connection specific logic

12 years agoam a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
Matthew Xie [Wed, 8 Aug 2012 07:35:29 +0000 (00:35 -0700)]
am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev

* commit 'a1f463cb1930e806420844d4915def2dcfe7ae72':
  Remove Profile Auto connection specific logic

12 years agoMerge "Remove Profile Auto connection specific logic" into jb-mr1-dev
Matthew Xie [Wed, 8 Aug 2012 07:33:38 +0000 (00:33 -0700)]
Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev

12 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 7 Aug 2012 23:12:21 +0000 (16:12 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoam 422446e1: (-s ours) am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0...
The Android Open Source Project [Tue, 7 Aug 2012 22:22:53 +0000 (15:22 -0700)]
am 422446e1: (-s ours) am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '422446e1ef8d42501a72800f81037ff142119f62':

12 years agoam eb2de9e8: (-s ours) am 6ac8bae6: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 7 Aug 2012 22:22:43 +0000 (15:22 -0700)]
am eb2de9e8: (-s ours) am 6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

12 years agoam 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
The Android Open Source Project [Tue, 7 Aug 2012 22:16:20 +0000 (15:16 -0700)]
am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '4325cf22ef3d381bc9d28d264571ba305da94d57':

12 years agoam 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
The Android Open Source Project [Tue, 7 Aug 2012 22:14:14 +0000 (15:14 -0700)]
am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '7e107a0903707876c0ad7dd4ee2702fd5baed7ae':

12 years agoReconcile with jb-mr0-release - do not merge
The Android Open Source Project [Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)]
Reconcile with jb-mr0-release - do not merge

Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5

12 years agoam 6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 7 Aug 2012 21:55:55 +0000 (14:55 -0700)]
am 6ac8bae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

12 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 7 Aug 2012 21:54:01 +0000 (14:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Aug 2012 21:27:38 +0000 (14:27 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Aug 2012 21:24:33 +0000 (14:24 -0700)]
Import translations. DO NOT MERGE

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

12 years agomerge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 7 Aug 2012 20:01:34 +0000 (13:01 -0700)]
merge in jb-mr0-release history after reset to jb-dev

12 years agoam eb657dc8: am f621435e: Merge "Add dev setting to enable global actions bug report...
Dianne Hackborn [Tue, 7 Aug 2012 18:52:56 +0000 (11:52 -0700)]
am eb657dc8: am f621435e: Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev

* commit 'eb657dc8eb8f6bb990b8dd974dd92844106f2572':
  Add dev setting to enable global actions bug report button.

12 years agoam f621435e: Merge "Add dev setting to enable global actions bug report button."...
Dianne Hackborn [Tue, 7 Aug 2012 18:51:11 +0000 (11:51 -0700)]
am f621435e: Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev

* commit 'f621435eafcb46f69b35b8a6b8119ab87801e9ef':
  Add dev setting to enable global actions bug report button.

12 years agoMerge "Add dev setting to enable global actions bug report button." into jb-mr1-dev
Dianne Hackborn [Tue, 7 Aug 2012 18:49:14 +0000 (11:49 -0700)]
Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev

12 years agoAdd dev setting to enable global actions bug report button.
Dianne Hackborn [Tue, 7 Aug 2012 18:26:32 +0000 (11:26 -0700)]
Add dev setting to enable global actions bug report button.

Change-Id: I3768f95e1c6fbec9c10186093e5e1d48b0ef6ae4

12 years agoam 5acc9098: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 7 Aug 2012 18:08:26 +0000 (11:08 -0700)]
am 5acc9098: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5acc909860388a8863e3ec9d38a290fd418cce22':

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 7 Aug 2012 18:04:56 +0000 (11:04 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie33aa8887f43fe794d289a745451db6fa73a9c20

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 7 Aug 2012 13:35:02 +0000 (06:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agoRemove Profile Auto connection specific logic
Ganesh Ganapathi Batta [Tue, 31 Jul 2012 23:12:46 +0000 (16:12 -0700)]
Remove Profile Auto connection specific logic

Remove  profile auto connection specific logic as it is not implemented in
Bluetooth app
Disconnect PBAP server connection  when user initiates device level disconnection

Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4

12 years agoam 8756c500: am 9effd146: Merge "Fix for correctly enabling PAN profile in Settings...
Matthew Xie [Tue, 7 Aug 2012 05:52:27 +0000 (22:52 -0700)]
am 8756c500: am 9effd146: Merge "Fix for correctly enabling PAN profile in Settings Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP i

* commit '8756c500a1aa22b9b81eeeb7f25ec7246a1c1464':
  Fix for correctly enabling PAN profile in Settings Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP inquiry. Now, the DeviceProfileSettings screens displays valid 'Internet connection sharing' option when connected as a NAP to remote PANU.

12 years agoam 9effd146: Merge "Fix for correctly enabling PAN profile in Settings Update the...
Matthew Xie [Tue, 7 Aug 2012 05:50:29 +0000 (22:50 -0700)]
am 9effd146: Merge "Fix for correctly enabling PAN profile in Settings Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP inquiry. Now,

* commit '9effd146114364c91d44b9a44ade761b69bdd1cf':
  Fix for correctly enabling PAN profile in Settings Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP inquiry. Now, the DeviceProfileSettings screens displays valid 'Internet connection sharing' option when connected as a NAP to remote PANU.

12 years agoMerge "Fix for correctly enabling PAN profile in Settings Update the connected profil...
Matthew Xie [Tue, 7 Aug 2012 05:48:41 +0000 (22:48 -0700)]
Merge "Fix for correctly enabling PAN profile in Settings Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP inquiry. Now, the DeviceProfileSettings screens displays valid 'Internet connection sharing' option when connected as a NAP to remote PANU." into jb-mr1-dev

12 years agoam 92970227: (-s ours) am 2e80628f: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Tue, 7 Aug 2012 02:54:43 +0000 (19:54 -0700)]
am 92970227: (-s ours) am 2e80628f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '92970227f5d296c8a53a037dd825035706edb6b4':
  Import translations. DO NOT MERGE

12 years agoam 2e80628f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 7 Aug 2012 02:53:17 +0000 (19:53 -0700)]
am 2e80628f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

12 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 7 Aug 2012 02:51:22 +0000 (19:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

12 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 7 Aug 2012 02:41:52 +0000 (19:41 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoam d542deb4: am cdc2c553: Add new dev settings to debug hardware layers
Romain Guy [Mon, 6 Aug 2012 21:57:54 +0000 (14:57 -0700)]
am d542deb4: am cdc2c553: Add new dev settings to debug hardware layers

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

12 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

12 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

12 years agoam 20d8abc6: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Mon, 6 Aug 2012 20:28:57 +0000 (13:28 -0700)]
am 20d8abc6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '20d8abc638df1dba3c9dc95601aabed200a5abd1':

12 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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Aug 2012 20:12:11 +0000 (13:12 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Aug 2012 20:09:25 +0000 (13:09 -0700)]
Import translations. DO NOT MERGE

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

12 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

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

* commit '010a775e5120a86d8495806ccde3db11948831ee':
  Import translations. DO NOT MERGE

12 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

12 years agoam ede6fa43: (-s ours) am c868a4ca: Import translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 21:42:09 +0000 (14:42 -0700)]
am ede6fa43: (-s ours) am c868a4ca: Import translations. DO NOT MERGE

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

12 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

12 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

12 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

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

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

12 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

12 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

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

* commit '31eab6973c5472475677532d0b4d63cacb64a656':
  Fixes list of TTS voices after changing voice data

12 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

12 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

12 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

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

* commit '09e97989f4d8846a202a8324e98a10ac52c543e6':
  Re-enable dreams: Settings

12 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

12 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

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

* commit '8ce21bdbd2a9d20cd88bfd491e7281114cc77cfa':
  Fix appwidget bind dialog

12 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

12 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

12 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

12 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