9497779888
am 876a43e3: (-s ours) am fb314c77: Import translations. DO NOT MERGE
...
* commit '876a43e36112d192f1ecf4b768afc619d775389c':
Import translations. DO NOT MERGE
2012-02-10 10:08:29 -08:00
876a43e361
am fb314c77: Import translations. DO NOT MERGE
...
* commit 'fb314c7782682b75b1be47beac0d5f2bcef2584c':
Import translations. DO NOT MERGE
2012-02-10 10:05:11 -08:00
fb314c7782
Import translations. DO NOT MERGE
...
Change-Id: Ia1e288e37af91e079027d742c389a6ce10bd247c
2012-02-08 18:10:33 -08:00
c3307f7b61
am 230d4c23: Reconcile with ics-mr1-release
...
* commit '230d4c236982058767225f59ad6b5a3fc3f638b6':
2012-02-01 10:01:23 -08:00
230d4c2369
Reconcile with ics-mr1-release
...
Change-Id: Ie670c123d7fe636bc2a6b441c4b42f74b1f326bc
2012-02-01 08:50:37 -08:00
8130432516
Reconcile with ics-mr1-release
...
Change-Id: Icbfa322624551425fadedb6a41a3a4d339e6ff52
2011-12-09 07:11:38 -08:00
9f0acb9bcd
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 17:35:53 -08:00
692999a463
am f4e80c84: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'f4e80c840944e81eae96426a995c26712f1b9780':
Import revised translations. DO NOT MERGE
2011-12-08 11:13:16 -08:00
f4e80c8409
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-12-08 11:09:35 -08:00
6ee8e41521
Import revised translations. DO NOT MERGE
...
Change-Id: I19b9e88f40d1929f7a30e3fbb5982bd7b7f25bde
2011-12-08 10:35:03 -08:00
63bd76fbd6
Reconcile with ics-mr1-release
...
Change-Id: I4b725ae1b482e0dd54d7646f24663c8492c2d049
2011-12-08 10:22:16 -08:00
55896d181c
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 07:01:06 -08:00
21376520a9
am 7bb005c6: Merge "Adding static wallpapers for crespo/tablet (Bug 5506089)" into ics-mr1
...
* commit '7bb005c6c80a81e5012a2cb9de702b498d6a9e2a':
Adding static wallpapers for crespo/tablet (Bug 5506089)
2011-12-07 17:34:30 -08:00
7bb005c6c8
Merge "Adding static wallpapers for crespo/tablet (Bug 5506089)" into ics-mr1
2011-12-07 17:33:18 -08:00
d6843b2075
Adding static wallpapers for crespo/tablet (Bug 5506089)
...
Change-Id: I7f56b046cf02c198def811e0113688d93008785a
2011-12-07 14:25:29 -08:00
b484829688
am c00f0b99: No longer using fastInvalidate() pattern for half of AllApps transition
...
* commit 'c00f0b996712243e0745ea1af870b0229ca11a73':
No longer using fastInvalidate() pattern for half of AllApps transition
2011-12-06 23:09:56 -08:00
c00f0b9967
No longer using fastInvalidate() pattern for half of AllApps transition
...
Turns out this was likely causing the hardware layer to be redrawn and hence
an anti-optimization
Change-Id: Ib98beebec6efed339eb9f918c24579af529e028e
2011-12-06 19:54:37 -08:00
e09baf3ebb
merge in ics-mr1-release history after reset to ics-mr1
2011-12-01 16:46:17 -08:00
72aff731f0
am 65604f16: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
...
* commit '65604f1668304ee7718459990206bd1783014771':
Remove dependency on support library. DO NOT MERGE.
2011-12-01 12:34:06 -08:00
65604f1668
Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
2011-12-01 12:31:52 -08:00
2ddae95674
am 1f73d893: Merge "Updating AllApps button asset." into ics-mr1
...
* commit '1f73d8939aa28d7ea79845c8e41941c5f4ab18fd':
Updating AllApps button asset.
2011-12-01 11:19:43 -08:00
125bd2134e
am 52d89c39: Merge "Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait." into ics-mr1
...
* commit '52d89c3908f26c867b6cbd3f6a84992a21aa30a6':
Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait.
2011-12-01 11:19:43 -08:00
1f73d8939a
Merge "Updating AllApps button asset." into ics-mr1
2011-12-01 10:56:02 -08:00
52d89c3908
Merge "Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait." into ics-mr1
2011-12-01 10:55:56 -08:00
332ffed2df
Remove dependency on support library. DO NOT MERGE.
...
Bug: 5689684
Change-Id: I57c662da9b2c2009ee1631e637e5f55deea021b7
2011-12-01 12:19:52 -05:00
6a7dbc646c
merge in ics-mr1-release history after reset to ics-mr1
2011-12-01 06:46:42 -08:00
313c837031
am 05bf644e: Fix memory leak in Launcher
...
* commit '05bf644e371c9d965ba864cf7dda6515c7cdce91':
Fix memory leak in Launcher
2011-11-30 21:11:18 -08:00
05bf644e37
Fix memory leak in Launcher
...
Leak happened when a stack view was on the
workspace and then workspace forced a rebind of
its items (for example, when an app was installed)
Bug # 5629171
2011-11-30 20:30:17 -08:00
25c16b2cf5
merge in ics-mr1-release history after reset to ics-mr1
2011-11-30 06:46:45 -08:00
d530bfa927
Updating AllApps button asset.
...
Change-Id: Ibcbb1e128b53348238e97e4ca67b7e470df3905b
2011-11-29 15:55:04 -08:00
fc894c6c07
Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait.
...
Change-Id: Ia0ad7d587e7c42004a87a1b9c9eacf2ab0b76d78
2011-11-29 13:36:53 -08:00
ffd5c57b92
am 3924df85: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '3924df85ac6ee052648944f271f947930e71e53a':
Import revised translations. DO NOT MERGE
2011-11-29 13:30:29 -08:00
3924df85ac
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-29 13:27:01 -08:00
1b714d0d22
Import revised translations. DO NOT MERGE
...
Change-Id: I1b9da9f81b31d7dc64d4c28def672f2fc084297d
2011-11-29 13:18:14 -08:00
275fc733a8
merge in ics-mr1-release history after reset to ics-mr1
2011-11-29 12:03:33 -08:00
09cecf6d85
am 7e38964c: Merge "Clean up unused code and import declarations" into ics-mr1
...
* commit '7e38964c43ecaca90b97d28e3190d71d19feeecc':
Clean up unused code and import declarations
2011-11-28 18:49:35 -08:00
7e38964c43
Merge "Clean up unused code and import declarations" into ics-mr1
2011-11-28 18:48:04 -08:00
502cd5ba07
am 4a22568d: Merge "Forcing tabs to be single line and width bound (Bug 5646142)" into ics-mr1
...
* commit '4a22568d492361e5118b0a01b9c4ec52017adc31':
Forcing tabs to be single line and width bound (Bug 5646142)
2011-11-28 18:05:44 -08:00
19610dbad3
am e96e5cb7: Fixing a few landscape issues.
...
* commit 'e96e5cb768fcc6f1211c8c31fa2da4dcd4e465cc':
Fixing a few landscape issues.
2011-11-28 18:05:44 -08:00
4a22568d49
Merge "Forcing tabs to be single line and width bound (Bug 5646142)" into ics-mr1
2011-11-28 18:04:17 -08:00
e96e5cb768
Fixing a few landscape issues.
...
- Fixing issue where widgets/icon names from side pages show in landscape (Bug 5665226)
- Fixing issue where the workspace was rendering over the hotseat in landscape (Bug 5665226)
- Fixing regression where the market button had no press feedback
Change-Id: Idcd890fdddab2d463195c9b3000fe7a0ab357200
2011-11-28 16:24:54 -08:00
19cd4b9b5b
Forcing tabs to be single line and width bound (Bug 5646142)
...
Change-Id: Ia84bde47c5e4b254b636b2697c4f4889ce4f8b95
2011-11-28 13:51:05 -08:00
da92a12b28
merge in ics-mr1-release history after reset to ics-mr1
2011-11-28 12:22:59 -08:00
92f3d46cf3
Clean up unused code and import declarations
...
Change-Id: If36fd2d99a51b07290b13f697b3ea08d31feb023
2011-11-28 10:51:22 -08:00
4575d2014c
am 8171d8ce: Merge "Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)" into ics-mr1
...
* commit '8171d8ce48765cbc9e6ed96ac3dc173a8969616d':
Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)
2011-11-23 17:02:22 -08:00
8171d8ce48
Merge "Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)" into ics-mr1
2011-11-23 17:00:17 -08:00
f52ab456d2
am 65f9e9d4: Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1
...
* commit '65f9e9d45b8ba9aa819be2c4fca1722db7784868':
Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)
2011-11-23 15:40:27 -08:00
ec301c29e5
am 97d6f9a7: Merge "Fixing an issue where qsb press states could be out of sync. (Bug 5627327)" into ics-mr1
...
* commit '97d6f9a705711870ee9a06fe4f28050228fcfb13':
Fixing an issue where qsb press states could be out of sync. (Bug 5627327)
2011-11-23 15:40:26 -08:00
65f9e9d45b
Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1
2011-11-23 15:38:42 -08:00
97d6f9a705
Merge "Fixing an issue where qsb press states could be out of sync. (Bug 5627327)" into ics-mr1
2011-11-23 15:38:34 -08:00
Eric Fischer
The Android Open Source Project
The Android Automerger
Winson Chung
Adam Cohen
Daniel Sandler
Michael Jurka