OSDN Git Service

android-x86/packages-apps-Trebuchet.git
11 years agoam d294cac5: am dddd6c31: am 0c2388a4: Let\'s enhance
Jason Chen [Mon, 15 Oct 2012 06:11:09 +0000 (23:11 -0700)]
am d294cac5: am dddd6c31: am 0c2388a4: Let\'s enhance

* commit 'd294cac5d83eb18dea9b2f84d4202b13f3ea3c43':
  Let's enhance

11 years agoam dddd6c31: am 0c2388a4: Let\'s enhance
Jason Chen [Mon, 15 Oct 2012 06:08:00 +0000 (23:08 -0700)]
am dddd6c31: am 0c2388a4: Let\'s enhance

* commit 'dddd6c3117c7e6a6af0dd6542c0e6225eb7e274d':
  Let's enhance

11 years agoam 0c2388a4: Let\'s enhance
Jason Chen [Mon, 15 Oct 2012 06:04:42 +0000 (23:04 -0700)]
am 0c2388a4: Let\'s enhance

* commit '0c2388a40c3435615afa1e9b424549d29a98f44e':
  Let's enhance

11 years agoLet's enhance
Jason Chen [Fri, 12 Oct 2012 17:47:11 +0000 (10:47 -0700)]
Let's enhance

Add mipmap-* launcher icon assets. Removes equivalent icons from
drawable directories and fixes up the reference to them in a layout.

Bug: 6718166
Change-Id: Ic97e3208d0b47523c8fabef949b2b06825e2fa8f

11 years agoam f5fb2a06: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
The Android Open Source Project [Fri, 12 Oct 2012 14:33:50 +0000 (07:33 -0700)]
am f5fb2a06: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f5fb2a0656d21a2bcc1dd419d3bbf3dc8f11c181':

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Fri, 12 Oct 2012 14:32:00 +0000 (07:32 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: If20e289cd34c19f80f7c2ad19587d19483a7700f

11 years agoam 4d36be5a: am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during...
Romain Guy [Fri, 12 Oct 2012 00:54:09 +0000 (17:54 -0700)]
am 4d36be5a: am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit '4d36be5ac4f128531865d706359ec10f7ab5996a':
  Remove unnecessary allocations during draw Bug #7327799

11 years agoam cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug ...
Romain Guy [Fri, 12 Oct 2012 00:11:14 +0000 (17:11 -0700)]
am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit 'cc69ee77b0a96baa75499c1a116d8cbbfce7422f':
  Remove unnecessary allocations during draw Bug #7327799

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 23:26:53 +0000 (16:26 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into...
Romain Guy [Thu, 11 Oct 2012 18:12:57 +0000 (11:12 -0700)]
am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit '0d06152d4026e933d8308002e1d53ca4eba6cad2':
  Remove unnecessary allocations during draw Bug #7327799

11 years agoMerge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev
Romain Guy [Thu, 11 Oct 2012 18:10:47 +0000 (11:10 -0700)]
Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

11 years agoam 74c697c7: am 80d64c28: am dfe0c293: Merge "Add entries for string resources that...
Michael Jurka [Thu, 11 Oct 2012 15:27:50 +0000 (08:27 -0700)]
am 74c697c7: am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit '74c697c7102c66c37f1588201750236234f20b12':
  Add entries for string resources that appear in clings

11 years agoam 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in...
Michael Jurka [Thu, 11 Oct 2012 15:26:07 +0000 (08:26 -0700)]
am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit '80d64c28f45e0378e05021dc9222982b3d67150e':
  Add entries for string resources that appear in clings

11 years agoam dfe0c293: Merge "Add entries for string resources that appear in clings" into...
Michael Jurka [Thu, 11 Oct 2012 15:24:57 +0000 (08:24 -0700)]
am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit 'dfe0c29383049b269094a51fd74e693a8cb9b5b0':
  Add entries for string resources that appear in clings

11 years agoMerge "Add entries for string resources that appear in clings" into jb-mr1-dev
Michael Jurka [Thu, 11 Oct 2012 15:23:09 +0000 (08:23 -0700)]
Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

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

11 years agoam c476f09d: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 15:08:17 +0000 (08:08 -0700)]
am c476f09d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c476f09d4a8c37c16e352cbcf3745e1b33ede7fb':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 15:05:52 +0000 (08:05 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ice7d89d927b01c03db60deaa0f00840df514ee96

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 14:04:12 +0000 (07:04 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam af503b04: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 13:02:20 +0000 (06:02 -0700)]
am af503b04: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'af503b044475dc29ce58f715739158036807e94e':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 12:57:54 +0000 (05:57 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Idf9e1ad5fe56ee4d56e5266630b6f971ecba10c7

11 years agoAdd entries for string resources that appear in clings
Michael Jurka [Thu, 11 Oct 2012 09:00:37 +0000 (11:00 +0200)]
Add entries for string resources that appear in clings

11 years agoam eddbe4e9: (-s ours) am 61854931: am 260eb9c6: Merge "Revert "Import translations...
Baligh Uddin [Thu, 11 Oct 2012 04:20:28 +0000 (21:20 -0700)]
am eddbe4e9: (-s ours) am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

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

11 years agoam 9fe1a25b: (-s ours) am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE...
Baligh Uddin [Thu, 11 Oct 2012 04:19:03 +0000 (21:19 -0700)]
am 9fe1a25b: (-s ours) am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

* commit '9fe1a25ba84ce7dace44c98c3bc8beb47bab1a4a':
  Revert "Import translations. DO NOT MERGE"

11 years agoam 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into...
Baligh Uddin [Thu, 11 Oct 2012 04:18:36 +0000 (21:18 -0700)]
am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '61854931252710cedbb596918dee6524723d1223':
  Revert "Import translations. DO NOT MERGE"

11 years agoam ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
Baligh Uddin [Thu, 11 Oct 2012 04:16:59 +0000 (21:16 -0700)]
am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

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

11 years agoam 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Thu, 11 Oct 2012 04:16:54 +0000 (21:16 -0700)]
am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '260eb9c6ff598d792b51e5c24608602a1f5b1504':
  Revert "Import translations. DO NOT MERGE"

11 years agoMerge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
Baligh Uddin [Thu, 11 Oct 2012 04:14:57 +0000 (21:14 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

11 years agoRevert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Oct 2012 04:14:47 +0000 (21:14 -0700)]
Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 4caeee6e08317abaf70b52e1a8b6b8a9e6300a7f

Change-Id: Ie3456538cf40d34ca9d1121cc523f968f2c3a9e2

11 years agoMerge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Thu, 11 Oct 2012 04:14:37 +0000 (21:14 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

11 years agoRevert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Oct 2012 04:14:29 +0000 (21:14 -0700)]
Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 2826bc4fb6ec196eb72be7b9ef569996e2ff0dd4

Change-Id: I232f8abdf1fdb592ba76216fc82d836294ca4e09

11 years agoMerge "Revert "Import translations. DO NOT MERGE""
Baligh Uddin [Thu, 11 Oct 2012 04:13:41 +0000 (21:13 -0700)]
Merge "Revert "Import translations. DO NOT MERGE""

11 years agoRevert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Oct 2012 04:13:25 +0000 (21:13 -0700)]
Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 83e8b468847b92ad11dead50d0c35f47b4b593e9

Change-Id: I42878c0de6156d23aa73fbf36ab699542b387c20

11 years agoam 9870efdd: (-s ours) am db983fa7: am f8a49f86: Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 11 Oct 2012 04:00:47 +0000 (21:00 -0700)]
am 9870efdd: (-s ours) am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '9870efdd359eef447709a92fef474afc04aba24a':
  Import translations. DO NOT MERGE

11 years agoam db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 11 Oct 2012 03:58:34 +0000 (20:58 -0700)]
am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam a2e9f101: (-s ours) am a7b29405: Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Thu, 11 Oct 2012 03:56:51 +0000 (20:56 -0700)]
am a2e9f101: (-s ours) am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

11 years agoam f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 11 Oct 2012 03:55:53 +0000 (20:55 -0700)]
am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 11 Oct 2012 03:55:33 +0000 (20:55 -0700)]
am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Oct 2012 03:55:03 +0000 (20:55 -0700)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 11 Oct 2012 03:53:39 +0000 (20:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 11 Oct 2012 03:53:19 +0000 (20:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoRemove unnecessary allocations during draw
Romain Guy [Thu, 11 Oct 2012 01:47:33 +0000 (18:47 -0700)]
Remove unnecessary allocations during draw
Bug #7327799

Change-Id: Ic3a18fb9d850f2c692dcb187a206c61dfa8108a4

11 years agoam 8dcd596e: am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb...
Michael Jurka [Wed, 10 Oct 2012 21:22:29 +0000 (14:22 -0700)]
am 8dcd596e: am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit '8dcd596e763b70740e6bdd3cac31fedc90cb8c8a':
  Update custom cling params

11 years agoam 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev
Michael Jurka [Wed, 10 Oct 2012 21:20:26 +0000 (14:20 -0700)]
am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit '37b2bac33e90411f2bfd0ee1117b595dcc2b50d5':
  Update custom cling params

11 years agoam a433be70: Merge "Update custom cling params" into jb-mr1-dev
Michael Jurka [Wed, 10 Oct 2012 21:18:09 +0000 (14:18 -0700)]
am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit 'a433be70632e02e32dfc2e26f03e7cabb7f0e208':
  Update custom cling params

11 years agoMerge "Update custom cling params" into jb-mr1-dev
Michael Jurka [Wed, 10 Oct 2012 21:15:46 +0000 (14:15 -0700)]
Merge "Update custom cling params" into jb-mr1-dev

11 years agoUpdate custom cling params
Michael Jurka [Wed, 10 Oct 2012 20:20:47 +0000 (22:20 +0200)]
Update custom cling params

Bug: 7318080

Change-Id: I77d73d81a60efa3886f088e82c6ba3466f6ac331

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 21:06:57 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 47cbf108: am 5ad9b521: am 5b589a01: Merge "Tweaking workspace overscroll effect...
Winson Chung [Wed, 10 Oct 2012 20:43:43 +0000 (13:43 -0700)]
am 47cbf108: am 5ad9b521: am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

* commit '47cbf10880d96d04b78bfceec72584717f62cc30':
  Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)

11 years agoam 5ad9b521: am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent...
Winson Chung [Wed, 10 Oct 2012 20:41:37 +0000 (13:41 -0700)]
am 5ad9b521: am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

* commit '5ad9b52148740b984509183fe3ecb9d8d81c702b':
  Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)

11 years agoam 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons...
Winson Chung [Wed, 10 Oct 2012 20:39:31 +0000 (13:39 -0700)]
am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

* commit '5b589a01cd291ae3599bc3824f6732c109df056a':
  Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)

11 years agoMerge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045...
Winson Chung [Wed, 10 Oct 2012 20:37:57 +0000 (13:37 -0700)]
Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Oct 2012 18:31:41 +0000 (11:31 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Oct 2012 18:30:52 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Oct 2012 18:30:23 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam e37fa977: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
The Android Open Source Project [Wed, 10 Oct 2012 16:51:07 +0000 (09:51 -0700)]
am e37fa977: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'e37fa97752cb0e8b79b94f1c1745894b40b7d57e':

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Wed, 10 Oct 2012 16:45:34 +0000 (09:45 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I6765f8f1401d75061c1ce4942c67bd6b4a74d286

11 years agomerge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 15:57:43 +0000 (08:57 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:45 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 5d1e9a5f: am 3bf0359f: am a113121f: Stop using mcc for custom workspace cling...
Michael Jurka [Wed, 10 Oct 2012 00:19:34 +0000 (17:19 -0700)]
am 5d1e9a5f: am 3bf0359f: am a113121f: Stop using mcc for custom workspace cling on sw600dp devices

* commit '5d1e9a5f54d0937e7e5565687b3cc85791239c6d':
  Stop using mcc for custom workspace cling on sw600dp devices

11 years agoam 3bf0359f: am a113121f: Stop using mcc for custom workspace cling on sw600dp devices
Michael Jurka [Wed, 10 Oct 2012 00:16:54 +0000 (17:16 -0700)]
am 3bf0359f: am a113121f: Stop using mcc for custom workspace cling on sw600dp devices

* commit '3bf0359f286cd78ef0c64df75914e399320d884f':
  Stop using mcc for custom workspace cling on sw600dp devices

11 years agoam a113121f: Stop using mcc for custom workspace cling on sw600dp devices
Michael Jurka [Wed, 10 Oct 2012 00:14:50 +0000 (17:14 -0700)]
am a113121f: Stop using mcc for custom workspace cling on sw600dp devices

* commit 'a113121fd3c43f1e1d23064e17c540c48fe330cc':
  Stop using mcc for custom workspace cling on sw600dp devices

11 years agoTweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)
Winson Chung [Tue, 9 Oct 2012 22:03:57 +0000 (15:03 -0700)]
Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)

Change-Id: I96514f762a1af1ec66523afde7db7a967b625afb

11 years agoam 7bd31959: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:35:41 +0000 (07:35 -0700)]
am 7bd31959: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7bd31959b18aa609a2272dfb3e6678f43a90a661':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:30:27 +0000 (07:30 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I76401e4d503b987805ad009441310290bef71483

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 13:59:47 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoStop using mcc for custom workspace cling on sw600dp devices
Michael Jurka [Tue, 9 Oct 2012 12:46:26 +0000 (14:46 +0200)]
Stop using mcc for custom workspace cling on sw600dp devices

Bug: 7203884

11 years agoam 82c0fe72: am 75f63ee4: am 98d7bd72: Merge "Re-merge "Add support for custom manta...
Michael Jurka [Mon, 8 Oct 2012 20:36:41 +0000 (13:36 -0700)]
am 82c0fe72: am 75f63ee4: am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev

* commit '82c0fe723c1542023fe0e61bc628b8a729be1692':
  Re-merge "Add support for custom manta cling"

11 years agoam 75f63ee4: am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into...
Michael Jurka [Mon, 8 Oct 2012 20:33:47 +0000 (13:33 -0700)]
am 75f63ee4: am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev

* commit '75f63ee49e64abe407ac123068c6e271331e9aee':
  Re-merge "Add support for custom manta cling"

11 years agoam a64478fd: am 570caf27: am 6c5679e5: Merge "Fix bug 6886990: cling accessibility...
Michael Jurka [Mon, 8 Oct 2012 20:33:44 +0000 (13:33 -0700)]
am a64478fd: am 570caf27: am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev

* commit 'a64478fdc28996f6145c992358f90ca66775266e':
  Fix bug 6886990: cling accessibility

11 years agoam 570caf27: am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 20:32:20 +0000 (13:32 -0700)]
am 570caf27: am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev

* commit '570caf27d97de328e8c500bb96f917760bdc12dc':
  Fix bug 6886990: cling accessibility

11 years agoam 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 20:31:21 +0000 (13:31 -0700)]
am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev

* commit '98d7bd72df9833b0149dd4772cce710fa4b7476d':
  Re-merge "Add support for custom manta cling"

11 years agoam e027023e: am 67c251bb: am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped...
Michael Jurka [Mon, 8 Oct 2012 20:30:12 +0000 (13:30 -0700)]
am e027023e: am 67c251bb: am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev

* commit 'e027023eb2c384b77c124d55fdc1711035d52781':
  Fix bug 7288630: Folder icons clipped on manta

11 years agoam 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 20:29:56 +0000 (13:29 -0700)]
am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev

* commit '6c5679e5ddbac06d555f1242a2cf082deb71de21':
  Fix bug 6886990: cling accessibility

11 years agoMerge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 20:29:24 +0000 (13:29 -0700)]
Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev

11 years agoMerge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 20:28:37 +0000 (13:28 -0700)]
Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev

11 years agoam 67c251bb: am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta"...
Michael Jurka [Mon, 8 Oct 2012 20:27:50 +0000 (13:27 -0700)]
am 67c251bb: am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev

* commit '67c251bb26c7f1cdb89550ad805c4e521315e2a8':
  Fix bug 7288630: Folder icons clipped on manta

11 years agoam f4b2836d: am 953ce06f: am dad6ca7b: Merge "Bug 7301303: more rows in all apps...
Michael Jurka [Mon, 8 Oct 2012 20:26:16 +0000 (13:26 -0700)]
am f4b2836d: am 953ce06f: am dad6ca7b: Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev

* commit 'f4b2836d6c500a229dd7097c878b251b205d980b':
  Bug 7301303: more rows in all apps for sw720dp-port

11 years agoam ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 20:25:24 +0000 (13:25 -0700)]
am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev

* commit 'ec437d0e7e95420213abcebcb832eb10e8196a20':
  Fix bug 7288630: Folder icons clipped on manta

11 years agoam 953ce06f: am dad6ca7b: Merge "Bug 7301303: more rows in all apps for sw720dp-port...
Michael Jurka [Mon, 8 Oct 2012 20:23:54 +0000 (13:23 -0700)]
am 953ce06f: am dad6ca7b: Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev

* commit '953ce06f73e19ba4fa4c67dbaf741385ec170ba3':
  Bug 7301303: more rows in all apps for sw720dp-port

11 years agoMerge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 20:23:23 +0000 (13:23 -0700)]
Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev

11 years agoam dad6ca7b: Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb...
Michael Jurka [Mon, 8 Oct 2012 20:22:34 +0000 (13:22 -0700)]
am dad6ca7b: Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev

* commit 'dad6ca7b1417984c579eadc50f3a1d9a948042fe':
  Bug 7301303: more rows in all apps for sw720dp-port

11 years agoMerge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 20:21:18 +0000 (13:21 -0700)]
Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev

11 years agoam 38223400: (-s ours) am e33f6d36: am e3304327: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 20:04:35 +0000 (13:04 -0700)]
am 38223400: (-s ours) am e33f6d36: am e3304327: Import translations. DO NOT MERGE

* commit '3822340051647969fb4bdc814782622d1d593adf':
  Import translations. DO NOT MERGE

11 years agoam 21fd4ab9: (-s ours) am 04220c34: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 20:03:04 +0000 (13:03 -0700)]
am 21fd4ab9: (-s ours) am 04220c34: Import translations. DO NOT MERGE

* commit '21fd4ab93f1959ad5e2eb1d609d3ccc491615d15':
  Import translations. DO NOT MERGE

11 years agoam e33f6d36: am e3304327: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 20:02:37 +0000 (13:02 -0700)]
am e33f6d36: am e3304327: Import translations. DO NOT MERGE

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

11 years agoam 04220c34: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 20:01:06 +0000 (13:01 -0700)]
am 04220c34: Import translations. DO NOT MERGE

* commit '04220c340e6f08317795a04b9ca89458f9820f55':
  Import translations. DO NOT MERGE

11 years agoam e3304327: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 20:00:22 +0000 (13:00 -0700)]
am e3304327: Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 18:26:31 +0000 (11:26 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 18:26:04 +0000 (11:26 -0700)]
Import translations. DO NOT MERGE

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

11 years agoBug 7301303: more rows in all apps for sw720dp-port
Michael Jurka [Mon, 8 Oct 2012 15:19:32 +0000 (17:19 +0200)]
Bug 7301303: more rows in all apps for sw720dp-port

11 years agoFix bug 7288630: Folder icons clipped on manta
Michael Jurka [Mon, 8 Oct 2012 14:24:46 +0000 (16:24 +0200)]
Fix bug 7288630: Folder icons clipped on manta

11 years agoRe-merge "Add support for custom manta cling"
Michael Jurka [Mon, 8 Oct 2012 11:21:35 +0000 (13:21 +0200)]
Re-merge "Add support for custom manta cling"

Also, fix issue where mako was crashing because
Launcher was trying to load a custom cling for it.
It was doing this because a custom home layout was
specified by SetupWizard, but for now we only want
custom clings on large devices

Bug: 7302705
Bug: 6992663

This reverts commit 2ebcf509f038f435ca8819dc098a7cb480bed0d9.

Change-Id: I46533309d5c62edfbd3a3b178c6965ffc73b6476

11 years agoFix bug 6886990: cling accessibility
Michael Jurka [Thu, 4 Oct 2012 15:42:38 +0000 (17:42 +0200)]
Fix bug 6886990: cling accessibility

Clings should block interaction with elements
below when Talkback is enabled

Change-Id: Ifdcd109351fd3c2d6dc97ad75ea3ab6eea48b582

11 years agoam 0e4803fc: am 914d5550: Merge "Revert "Add support for custom manta cling"" into...
Michael Jurka [Mon, 8 Oct 2012 06:41:58 +0000 (23:41 -0700)]
am 0e4803fc: am 914d5550: Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev

* commit '0e4803fc9585e7a3296b9341c6557513aee3eaa4':
  Revert "Add support for custom manta cling"

11 years agoam 914d5550: Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 06:38:33 +0000 (23:38 -0700)]
am 914d5550: Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev

* commit '914d55501146cf2c3abdf52c021b40fa789d211a':
  Revert "Add support for custom manta cling"

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 8 Oct 2012 01:58:14 +0000 (18:58 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge "Revert "Add support for custom manta cling"" into jb-mr1-dev
Michael Jurka [Mon, 8 Oct 2012 00:56:13 +0000 (17:56 -0700)]
Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev

11 years agoRevert "Add support for custom manta cling"
Michael Jurka [Mon, 8 Oct 2012 00:38:56 +0000 (02:38 +0200)]
Revert "Add support for custom manta cling"

This reverts commit 68255cbabe1cb7fbfc0706a8a2e1b1927eae1b55.

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 23:05:32 +0000 (16:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev