deb65d6f87
am a7ec8fa4: Reconcile with jb-release nakasi-factoryrom-release
...
* commit 'a7ec8fa4d664f6ffdad038acbaa66b4f0915be46':
2012-05-29 09:45:00 -07:00
a7ec8fa4d6
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: If959f96550e42768469ecd2f54ba60ba62140ca9
2012-05-29 09:41:18 -07:00
a75f1b2018
merge in jb-release history after reset to jb-dev
2012-05-29 08:59:54 -07:00
a2fe78630a
Don't scale shortcut icons during install animation
...
Bug: 6540432
Change-Id: I5760b1a66d3871702fea1cb51e5ba31d812a8158
2012-05-29 05:58:17 -07:00
68f681bc7a
Adding debugging for stuck widget (issue 6557954)
...
Change-Id: I73217d6a5dd650278f93ae02672c92c823e08ded
2012-05-28 15:39:23 -07:00
1d8f57a1f4
am 4c4aacaf: am 951ec583: Merge "Fix issue where reorder animations could leave views in translated state" into jb-dev
...
* commit '4c4aacafd15c59ce92786144a892fd90c8897b70':
Fix issue where reorder animations could leave views in translated state
2012-05-25 12:01:15 -07:00
4c4aacafd1
am 951ec583: Merge "Fix issue where reorder animations could leave views in translated state" into jb-dev
...
* commit '951ec583cde0b2299d1be2ba467c77b280242d7b':
Fix issue where reorder animations could leave views in translated state
2012-05-25 11:58:14 -07:00
951ec583cd
Merge "Fix issue where reorder animations could leave views in translated state" into jb-dev
2012-05-25 11:55:59 -07:00
2fd4906c81
am 36cce314: (-s ours) am 23fa01bb: Import translations. DO NOT MERGE
...
* commit '36cce31402de8f71c8049aed596f55f929ff7844':
Import translations. DO NOT MERGE
2012-05-25 11:38:06 -07:00
36cce31402
am 23fa01bb: Import translations. DO NOT MERGE
...
* commit '23fa01bbdae5a89e6d77b604598313c6b150f36a':
Import translations. DO NOT MERGE
2012-05-25 11:35:13 -07:00
269921d390
Import translations. DO NOT MERGE
...
Change-Id: I7245753ffe4d5d8348b0015ce27088aacb0d9b0c
2012-05-25 11:30:14 -07:00
23fa01bbda
Import translations. DO NOT MERGE
...
Change-Id: I5680c5bc29da382eb297a91553bd32de58b1e707
2012-05-25 11:29:28 -07:00
e7587d2f23
Fix issue where reorder animations could leave views in translated state
...
Change-Id: I75f590c4ba43fec0550bbd003022d5c8309881a3
2012-05-24 18:50:41 -07:00
96242bf8ed
am 5f74f11c: am 7ce9985d: Fixing issue where multiple widget pages would fail to load correctly, preventing you from adding widgets. (Bug 6556434)
...
* commit '5f74f11cc18fd75004fb39e9e0b942b222811c53':
Fixing issue where multiple widget pages would fail to load correctly, preventing you from adding widgets. (Bug 6556434)
2012-05-24 17:52:02 -07:00
5f74f11cc1
am 7ce9985d: Fixing issue where multiple widget pages would fail to load correctly, preventing you from adding widgets. (Bug 6556434)
...
* commit '7ce9985d37e253a93617404d5991017e1ea81907':
Fixing issue where multiple widget pages would fail to load correctly, preventing you from adding widgets. (Bug 6556434)
2012-05-24 17:49:59 -07:00
7ce9985d37
Fixing issue where multiple widget pages would fail to load correctly, preventing you from adding widgets. (Bug 6556434)
...
Change-Id: I48a8aa51d892aef7036009a608903fe089136d82
2012-05-24 17:35:56 -07:00
cacccc01aa
am a7075f96: am bd247198: Merge "Fixing issue with resource ids. (Bug 6532243)" into jb-dev
...
* commit 'a7075f96d0cc9610c06680ea1d241f6c0a8c69ae':
Fixing issue with resource ids. (Bug 6532243)
2012-05-24 11:13:30 -07:00
a7075f96d0
am bd247198: Merge "Fixing issue with resource ids. (Bug 6532243)" into jb-dev
...
* commit 'bd247198516be22cbf56b1a828c7dd43f9848591':
Fixing issue with resource ids. (Bug 6532243)
2012-05-24 10:26:20 -07:00
bd24719851
Merge "Fixing issue with resource ids. (Bug 6532243)" into jb-dev
2012-05-24 10:23:16 -07:00
49213977ff
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-24 10:19:14 -07:00
0e1f4813bd
am 1e2abeaf: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '1e2abeafb96fecadb709c63d430c21b56c5be451':
Updating with higher quality nakasi wallpapers.
2012-05-24 09:04:11 -07:00
1e2abeafb9
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I8413b3bf0524dbfee9b1d5201774e2e519e56cf8
2012-05-24 09:01:36 -07:00
be01b2edb9
merge in jb-release history after reset to jb-dev
2012-05-24 07:01:31 -07:00
ed89dc36d7
am 3c68bdb2: am d024f984: Cleaning up some reordering issues:
...
* commit '3c68bdb26643eacbb411759799f6fcfb934c34eb':
Cleaning up some reordering issues:
2012-05-23 19:03:49 -07:00
3c68bdb266
am d024f984: Cleaning up some reordering issues:
...
* commit 'd024f9845a0974ab525baad085f316031cd5a742':
Cleaning up some reordering issues:
2012-05-23 19:01:44 -07:00
d024f9845a
Cleaning up some reordering issues:
...
-> Reorder solution should never change unless target cell changes
-> Simplified code and improved the behaviour when items' jiggle
animations switch from one direction to another. These transitions
are now seamless and have no more strange delays.
Change-Id: I35d70f275d622501851328584bfcb46eec91ff3b
2012-05-23 18:57:49 -07:00
5b050153bf
Updating with higher quality nakasi wallpapers.
...
Change-Id: I79b25b7cf0a14aed551331a5964aaef86f39ba6a
2012-05-23 17:36:51 -07:00
4068e1d0eb
am 47bbf0d1: am 56734d7e: Merge "Fix issue with re-order animation not hinting the correct direction" into jb-dev
...
* commit '47bbf0d1d73bce72bca4fe1a419d636ed156410f':
Fix issue with re-order animation not hinting the correct direction
2012-05-23 16:20:26 -07:00
47bbf0d1d7
am 56734d7e: Merge "Fix issue with re-order animation not hinting the correct direction" into jb-dev
...
* commit '56734d7e86fdd9c9a012f809d335749511361d55':
Fix issue with re-order animation not hinting the correct direction
2012-05-23 16:18:18 -07:00
56734d7e86
Merge "Fix issue with re-order animation not hinting the correct direction" into jb-dev
2012-05-23 16:16:29 -07:00
093f6c28c4
am 388c546e: am 5eb21c9b: Referencing wrong drawable in drop target bar.
...
* commit '388c546e474e64872dce492f1ee73fc0ba3b6d55':
Referencing wrong drawable in drop target bar.
2012-05-23 16:15:31 -07:00
388c546e47
am 5eb21c9b: Referencing wrong drawable in drop target bar.
...
* commit '5eb21c9b1a677354e72c71b5504d3f8bc2e5f013':
Referencing wrong drawable in drop target bar.
2012-05-23 16:12:09 -07:00
2816ca58d3
Fixing issue with resource ids. (Bug 6532243)
...
Change-Id: Ie4a245a224038a750e60b0203003638fd561713d
2012-05-23 15:39:39 -07:00
5eb21c9b1a
Referencing wrong drawable in drop target bar.
...
Change-Id: Ib942779b117cd6a473f9dc8305ab6085901bc8f6
2012-05-23 14:07:42 -07:00
fe41ac641b
Fix issue with re-order animation not hinting the correct direction
...
Change-Id: I5fdf55615fde974c2cc8ae1276031f413713cb10
2012-05-23 14:00:37 -07:00
b207758333
am 1473bbf9: am 4712529d: Merge "Updating with higher quality nakasi wallpapers." into jb-dev
...
* commit '1473bbf9703bab2af33c3d67af942c192ba6a198':
Updating with higher quality nakasi wallpapers.
2012-05-23 13:10:29 -07:00
1473bbf970
am 4712529d: Merge "Updating with higher quality nakasi wallpapers." into jb-dev
...
* commit '4712529da82263eb5c104beb66779d233f637ff5':
Updating with higher quality nakasi wallpapers.
2012-05-23 13:08:09 -07:00
4712529da8
Merge "Updating with higher quality nakasi wallpapers." into jb-dev
2012-05-23 13:05:14 -07:00
f4f4533025
Updating with higher quality nakasi wallpapers.
...
Change-Id: I79b25b7cf0a14aed551331a5964aaef86f39ba6a
2012-05-23 11:48:48 -07:00
560a501818
am cb54509b: am eff06b06: Merge "Fixing regression in landscape launcher, and enlarging the voice search proxy touch view." into jb-dev
...
* commit 'cb54509b7ea1cb9fde7381e03bb8f8b46e38191b':
Fixing regression in landscape launcher, and enlarging the voice search proxy touch view.
2012-05-23 11:31:53 -07:00
cb54509b7e
am eff06b06: Merge "Fixing regression in landscape launcher, and enlarging the voice search proxy touch view." into jb-dev
...
* commit 'eff06b06a5a29b699338ce04396a59735e9fd71a':
Fixing regression in landscape launcher, and enlarging the voice search proxy touch view.
2012-05-23 11:28:19 -07:00
eff06b06a5
Merge "Fixing regression in landscape launcher, and enlarging the voice search proxy touch view." into jb-dev
2012-05-23 11:25:20 -07:00
3364a8e13c
am bf2589fb: am a728543a: Merge "Fix a couple small bugs (issue 6539339)" into jb-dev
...
* commit 'bf2589fb51613f185b65140c40c4c52541af7b29':
Fix a couple small bugs (issue 6539339)
2012-05-23 11:18:41 -07:00
bf2589fb51
am a728543a: Merge "Fix a couple small bugs (issue 6539339)" into jb-dev
...
* commit 'a728543a34e4095dfd1f661dfd3dd6d2ccbca657':
Fix a couple small bugs (issue 6539339)
2012-05-23 11:16:01 -07:00
a728543a34
Merge "Fix a couple small bugs (issue 6539339)" into jb-dev
2012-05-23 11:13:42 -07:00
2034d7084a
merge in jb-release history after reset to jb-dev
2012-05-23 07:04:00 -07:00
a8c41ebb34
am 7e11bb83: am b77f116a: Merge "Updating how widget previews look" into jb-dev
...
* commit '7e11bb837af85fc9e92eb8f13ef3a659b13df6c5':
Updating how widget previews look
2012-05-22 23:44:57 -07:00
069cc49164
am f5fca850: am a4fe2128: Merge "Skip custom Play cling if no accounts are set up" into jb-dev
...
* commit 'f5fca8507fecbd476d61ed75c59b6aa53d57033b':
Skip custom Play cling if no accounts are set up
2012-05-22 23:44:55 -07:00
7e11bb837a
am b77f116a: Merge "Updating how widget previews look" into jb-dev
...
* commit 'b77f116a2b0489178cc4803952027ce9eb5289ad':
Updating how widget previews look
2012-05-22 23:42:53 -07:00
f5fca8507f
am a4fe2128: Merge "Skip custom Play cling if no accounts are set up" into jb-dev
...
* commit 'a4fe21285b33301ffed4d91ff03886ec5d30481a':
Skip custom Play cling if no accounts are set up
2012-05-22 23:42:52 -07:00
The Android Open Source Project
The Android Automerger
Michael Jurka
Adam Cohen
Winson Chung
Eric Fischer