Ed Heyl
30b804310b
reset to ics-mr1, but keep history
2011-10-26 18:50:24 +00:00
Eric Fischer
ff550276d7
am 88842020: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '88842020e75b8e1fd76ce18c2f486636e36af0b4':
Import revised translations. DO NOT MERGE
2011-10-26 18:34:23 +00:00
Eric Fischer
88842020e7
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-10-26 11:29:11 -07:00
Eric Fischer
138dea64f1
Import revised translations. DO NOT MERGE
...
Change-Id: I148c0854418139512c1c28e8bd0013a61f425d81
2011-10-26 11:07:54 -07:00
Eric Fischer
2b492d5392
Import revised translations. DO NOT MERGE
...
Change-Id: I0020670726cabd6727a1c837e9c5527537f87f83
2011-10-26 10:21:55 -07:00
The Android Automerger
12f3259cf5
merge in ics-release history after reset to master
2011-10-26 09:53:42 -07:00
Adam Cohen
b348b0665a
am 9891b26b: am 89024e04: Merge "Fixing AppsCustomize paging effect on tablet" into ics-mr1
...
* commit '9891b26b25363d1abe71a8b59232430e6abeaca0':
Fixing AppsCustomize paging effect on tablet
2011-10-26 07:56:05 -07:00
Winson Chung
4384af8b24
am b20a60bb: am 2dac580d: Merge "Fixing small tablet issues" into ics-mr1
...
* commit 'b20a60bbc409e0a24973a6167c88f3a11ab99654':
Fixing small tablet issues
2011-10-26 07:56:04 -07:00
Ed Heyl
20902206e9
am 9029b385: am 4f3cb091: Merge remote branch \'goog/ics-mr0\' into ics-mr1
...
* commit '9029b385a0d4281fbb1a7f74f36078ccabe29995':
Updated bug fix for Launcher reloading on mcc update.
2011-10-26 07:56:04 -07:00
Adam Cohen
9891b26b25
am 89024e04: Merge "Fixing AppsCustomize paging effect on tablet" into ics-mr1
...
* commit '89024e04ab9c78b7e5cf1699f16d813377b480f1':
Fixing AppsCustomize paging effect on tablet
2011-10-26 14:54:16 +00:00
Winson Chung
b20a60bbc4
am 2dac580d: Merge "Fixing small tablet issues" into ics-mr1
...
* commit '2dac580d5288067061fc6d598072050be4263df7':
Fixing small tablet issues
2011-10-26 14:54:15 +00:00
Ed Heyl
9029b385a0
am 4f3cb091: Merge remote branch \'goog/ics-mr0\' into ics-mr1
...
* commit '4f3cb091d6ded1e31db8dd21f019073a7cc9a2e2':
Updated bug fix for Launcher reloading on mcc update.
2011-10-26 14:54:15 +00:00
The Android Automerger
1f8bfa8c10
merge in ics-mr1-release history after reset to ics-mr1
2011-10-26 07:05:32 -07:00
Adam Cohen
89024e04ab
Merge "Fixing AppsCustomize paging effect on tablet" into ics-mr1
2011-10-25 16:24:26 -07:00
Winson Chung
1b7c1d3515
Cleaning up some code related to background alpha. (Bug: 5512761)
...
- Fixes problem where side pages animate in when going to/from all apps
- Fixes issue where current page outline shows on first drag after going to all apps
Change-Id: Id764ff30daf7f4e9ca6f57d3bcd939a8a20c9473
2011-10-25 16:00:10 -07:00
Adam Cohen
2591f6a520
Fixing AppsCustomize paging effect on tablet
...
Change-Id: I9ec1faeb4efa1b3db338bf47dceee72befbc682e
2011-10-25 14:37:45 -07:00
Winson Chung
2dac580d52
Merge "Fixing small tablet issues" into ics-mr1
2011-10-25 13:55:19 -07:00
Ed Heyl
4f3cb091d6
Merge remote branch 'goog/ics-mr0' into ics-mr1
2011-10-25 19:50:40 +00:00
Winson Chung
f8c1b58b8f
Fixing small tablet issues
...
- Removing phone search container bg from tablet ui
- Fixing the tab text for tablet AppsCustomize
- Fixing wallpaper items in wallpaper chooser
Change-Id: I3424cd8f32a767844b8bed54437f746a0fc381e5
2011-10-25 12:06:05 -07:00
Eric Fischer
a954946ea2
am 4a18fdfb: Merge "Import revised translations."
...
* commit '4a18fdfbcb2e5f59077fe8b17dca18113ce015d5':
Import revised translations.
2011-10-25 11:47:35 -07:00
Eric Fischer
4a18fdfbcb
Merge "Import revised translations."
2011-10-25 11:45:05 -07:00
Maarten Hooft
323eefca7a
Merge "Updated bug fix for Launcher reloading on mcc update." into ics-mr0
2011-10-25 11:06:02 -07:00
Eric Fischer
a55d95271d
Import revised translations.
...
Change-Id: I8a3a92e4cd238cd59382239d5882da00163e2697
2011-10-25 10:52:31 -07:00
Reena Lee
99a73f31b7
Updated bug fix for Launcher reloading on mcc update.
...
Store the previousConfig's mcc value only instead of configuration object.
The mPreviousConfig object was a reference to the same object ResourceManager
was using, which can change by the time LauncherModel gets the intent for
ACTION_CONFIGURATION_CHANGED.
This was causing Launcher to not reload all apps as the currentConfig and previousConfig always matched.
Bug 5040470
Change-Id: Ie7102cc233177e05cb0e0e2ae4240309c16ebf66
2011-10-24 17:37:11 -07:00
Eric Fischer
8f468f2bd0
am 6549ea52: (-s ours) am 495f9022: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '6549ea52aefbae7188067c8273705771de230e2f':
Import revised translations. DO NOT MERGE
2011-10-24 17:14:12 -07:00
Eric Fischer
6549ea52ae
am 495f9022: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '495f9022ecee8965b4576ade69ee0f005a3f6061':
Import revised translations. DO NOT MERGE
2011-10-24 17:12:20 -07:00
Eric Fischer
495f9022ec
Import revised translations. DO NOT MERGE
...
Change-Id: I3e6cdc7164ec5354748dced1569ede0d3ef58424
2011-10-24 17:08:52 -07:00
The Android Automerger
81080f5ed6
merge in ics-release history after reset to master
2011-10-23 07:02:12 -07:00
Eric Fischer
aed6f403b4
am 10ba83e4: (-s ours) am f060868d: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '10ba83e40728fc76a35bf7d6b1a2dae3150bf98d':
Import revised translations. DO NOT MERGE
2011-10-21 16:05:59 -07:00
Eric Fischer
10ba83e407
am f060868d: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit 'f060868dd6ca8fb2f199fefd5cbb19a75ac2c108':
Import revised translations. DO NOT MERGE
2011-10-21 16:02:25 -07:00
Eric Fischer
f060868dd6
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-21 16:00:02 -07:00
Winson Chung
8484a8bf31
am 0ade43ab: am 29454729: Merge "Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)" into ics-mr0
...
* commit '0ade43ab8c1daf4f753d33c216ef83bdc78c194d':
Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)
2011-10-21 14:41:01 -07:00
Eric Fischer
295c5e387d
Import revised translations. DO NOT MERGE
...
Change-Id: I27a0b164d00681bfd95f31a5faad3928552a187e
2011-10-21 14:39:21 -07:00
Winson Chung
0ade43ab8c
am 29454729: Merge "Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)" into ics-mr0
...
* commit '29454729ae8bda1e478537965820b88c31bd091d':
Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)
2011-10-21 14:38:29 -07:00
Winson Chung
53340d1eca
am 33243355: am 54103eb3: Merge "Adding additional checks to prevent launcher crash when we can\'t compose animation buffer. (Bug: 5478481)" into ics-mr0
...
* commit '3324335515dc6525b312adef5e548925e73725b5':
Adding additional checks to prevent launcher crash when we can't compose animation buffer. (Bug: 5478481)
2011-10-21 14:01:23 -07:00
Eric Fischer
6e40a72235
am 63bcfb77: (-s ours) am 442b5325: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '63bcfb77e03cb64c9dda9d74397c70c024c2ac40':
Import revised translations. DO NOT MERGE
2011-10-21 14:01:23 -07:00
Winson Chung
3324335515
am 54103eb3: Merge "Adding additional checks to prevent launcher crash when we can\'t compose animation buffer. (Bug: 5478481)" into ics-mr0
...
* commit '54103eb3f9fb6e1fd4d1b83c784a23b80323ec75':
Adding additional checks to prevent launcher crash when we can't compose animation buffer. (Bug: 5478481)
2011-10-21 13:59:10 -07:00
Eric Fischer
63bcfb77e0
am 442b5325: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '442b53259fe19626c322ea5aaeddc8edba6109f9':
Import revised translations. DO NOT MERGE
2011-10-21 13:59:10 -07:00
Winson Chung
29454729ae
Merge "Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)" into ics-mr0
2011-10-21 12:26:21 -07:00
Winson Chung
6a8103c7ef
Adding check in when getting current tab tag to prevent crash/NPE. (Bug: 5492469)
...
Change-Id: I51960bafbf1a9b2201639fb34786a7415e1e57dd
2011-10-21 11:09:16 -07:00
Winson Chung
54103eb3f9
Merge "Adding additional checks to prevent launcher crash when we can't compose animation buffer. (Bug: 5478481)" into ics-mr0
2011-10-21 10:54:40 -07:00
Eric Fischer
442b53259f
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-21 09:36:57 -07:00
Winson Chung
097e6c71b1
Adding additional checks to prevent launcher crash when we can't compose animation buffer. (Bug: 5478481)
...
Change-Id: I5671bffab8626b4e2224ef4c174204a5a3b68f97
2011-10-20 18:18:14 -07:00
Claudia de Veaux
bf28a31620
am 472cd638: Merge "String scrub to bring to punc, wording, etc. standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"
...
* commit '472cd63868616bf3a8493484794356a1616a22c6':
String scrub to bring to punc, wording, etc. standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
2011-10-20 18:07:40 -07:00
Claudia de Veaux
472cd63868
Merge "String scrub to bring to punc, wording, etc. standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"
2011-10-20 18:05:29 -07:00
Eric Fischer
e6a089ef57
Import revised translations. DO NOT MERGE
...
Change-Id: I2d01ca36d712fa73e93926d07ac717137c550f98
2011-10-20 18:02:43 -07:00
Adam Cohen
07bc0847b9
am b36d9a5a: am dd3a3d9c: Merge "Fixing AllAppsCustomize Keyboard Accessibility / NPE (issue 5483485)" into ics-mr0
...
* commit 'b36d9a5a667366b852f2b7be6ab0f15b3add1907':
Fixing AllAppsCustomize Keyboard Accessibility / NPE (issue 5483485)
2011-10-20 14:46:24 -07:00
Adam Cohen
b36d9a5a66
am dd3a3d9c: Merge "Fixing AllAppsCustomize Keyboard Accessibility / NPE (issue 5483485)" into ics-mr0
...
* commit 'dd3a3d9cf94b80c356ca1d9ca62a3b90e0d56c5c':
Fixing AllAppsCustomize Keyboard Accessibility / NPE (issue 5483485)
2011-10-20 14:43:49 -07:00
Adam Cohen
dd3a3d9cf9
Merge "Fixing AllAppsCustomize Keyboard Accessibility / NPE (issue 5483485)" into ics-mr0
2011-10-20 14:41:47 -07:00
Claudia de Veaux
0c2aecb621
String scrub to bring to punc, wording, etc. standards.
...
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
Change-Id: I20e5b747fe040f26cbfe38a61bb5aafc68115671
2011-10-20 12:26:18 -07:00