summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0ee2a438: Merge "Fixing issue where widget previews were being scaled ↵Winson Chung2011-10-315-91/+39
|\ | | | | | | | | | | | | up." into ics-mr1 * commit '0ee2a438193205466aff63dd690ba6ca9796ddae': Fixing issue where widget previews were being scaled up.
| * Merge "Fixing issue where widget previews were being scaled up." into ics-mr1Winson Chung2011-10-315-91/+39
| |\
| | * Fixing issue where widget previews were being scaled up.Winson Chung2011-10-285-91/+39
| | | | | | | | | | | | Change-Id: I94eaa1beb0579c8045a3b4c6ff72f7b9622a62ff
* | | am 6e8dc357: Merge "Fix NPE" into ics-mr1Michael Jurka2011-10-312-4/+7
|\| | | | | | | | | | | | | | * commit '6e8dc3572fb424b488e09fcc2e695a2655cbb68d': Fix NPE
| * | Merge "Fix NPE" into ics-mr1Michael Jurka2011-10-302-4/+7
| |\ \ | | |/ | |/|
| | * Fix NPEMichael Jurka2011-10-282-4/+7
| | | | | | | | | | | | | | | Bug # 5340102 Change-Id: Ibcdb549f4987f67c797c0618c8f54d3b1054261f
* | | am 81d7ee28: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '81d7ee28135139e7f3a97ccad19b78e5880371b0': Import revised translations. DO NOT MERGE
| * | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-2847-50/+990
| |\ \
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-10-2847-50/+990
| | | | | | | | | | | | | | | | Change-Id: I9032a0b75d14cf33f128ce594f7767a6b34456e9
* | | | Merge "Import revised translations."Eric Fischer2011-10-2847-679/+1619
|\ \ \ \
| * | | | Import revised translations.Eric Fischer2011-10-2847-679/+1619
| | | | | | | | | | | | | | | | | | | | Change-Id: I1d3a5371c7c815e259378efa2c4baa89d5a6f5b4
* | | | | am 4ab8c4e1: (-s ours) am 9665a887: (-s ours) Merge "Import revised ↵Eric Fischer2011-10-270-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE" into ics-mr0 * commit '4ab8c4e12ada37e1eaaf619e374cd60ac2d2dba4': Import revised translations. DO NOT MERGE
| * | | | am 9665a887: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-270-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '9665a88792f2045e3b2f329ccb0c80e245efd0bd': Import revised translations. DO NOT MERGE
| | * \ \ \ Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-273-3/+3
| | |\ \ \ \
| | | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-273-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b73fbf48d6c5ff66debbd97e49777bf26fea82d
* | | | | | | am c5deca7c: Merge "Asset updates" into ics-mr1Michael Jurka2011-10-2736-21/+60
|\| | | | | | | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * commit 'c5deca7c6a4139875e9b86c951f2b81b2db9f816': Asset updates
| * | | | | Merge "Asset updates" into ics-mr1Michael Jurka2011-10-2736-21/+60
| |\ \ \ \ \
| | * | | | | Asset updatesPeter Ng2011-10-2736-21/+60
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change how default widget previews look (5509429) - Improve antialiasing in portal assets Change-Id: I9993aec46a9a9ab8a732b4fc150120c935523f02
* | | | | | am 0191f1c9: Merge "Fixing issue where we were unnecessarily center pages ↵Winson Chung2011-10-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vertically (Bug: 5521605)" into ics-mr1 * commit '0191f1c9d8cd01eb40f96db23dab07961ae886c2': Fixing issue where we were unnecessarily center pages vertically (Bug: 5521605)
| * | | | | Merge "Fixing issue where we were unnecessarily center pages vertically ↵Winson Chung2011-10-271-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | (Bug: 5521605)" into ics-mr1
| | * | | | Fixing issue where we were unnecessarily center pages vertically (Bug: 5521605)Winson Chung2011-10-261-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Centering pages vertically have no real effect on the phone as the page height is effectively the size of the container, but on tablets, pages can be significantly smaller to allow tapping the empty space to dismiss it. Change-Id: I2f5117c287df6c5357039696f456d1d9d6c2af57
* | | | | am 42766c4c: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '42766c4cee2769df178c8bbb2eac9720d016d50f': Import revised translations. DO NOT MERGE
| * | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-274-27/+27
| |\ \ \ \
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-264-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I625f4feec34f74b0a87bcf7af2894e03683acfd1
* | | | | | am cea7ac9a: am fcf249b5: (-s ours) Merge "Asset updates" into ics-mr0Michael Jurka2011-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cea7ac9a1dfcb2685125c2b6250dae8c2b934139': Asset updates
| * | | | | am fcf249b5: (-s ours) Merge "Asset updates" into ics-mr0Michael Jurka2011-10-270-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | * commit 'fcf249b51cf7bd7d26ac1a65d5d5267fa60c4e9c': Asset updates
| | * | | Merge "Asset updates" into ics-mr0Michael Jurka2011-10-2636-21/+60
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Asset updatesPeter Ng2011-10-2636-21/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change how default widget previews look (5509429) - Improve antialiasing in portal assets Change-Id: I9993aec46a9a9ab8a732b4fc150120c935523f02
* | | | | am faa702dc: Merge "Initial changes to make folders accessible" into ics-mr1Adam Cohen2011-10-265-14/+134
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'faa702dca81afa700dddaa01b2a73774085db515': Initial changes to make folders accessible
| * | | | Merge "Initial changes to make folders accessible" into ics-mr1Adam Cohen2011-10-265-14/+134
| |\ \ \ \
| | * | | | Initial changes to make folders accessibleAdam Cohen2011-10-265-14/+134
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8c9cbc0ef200967c3b966fbccfdfde184d4211c
* | | | | | am ac9abca0: Merge "Cleaning up some code related to background alpha. (Bug: ↵Winson Chung2011-10-261-40/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5512761)" into ics-mr1 * commit 'ac9abca0242a5bfe4c40d2d7b43efc10f26d2f5f': Cleaning up some code related to background alpha. (Bug: 5512761)
| * | | | | Merge "Cleaning up some code related to background alpha. (Bug: 5512761)" ↵Winson Chung2011-10-261-40/+61
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| | * | | | | Cleaning up some code related to background alpha. (Bug: 5512761)Winson Chung2011-10-251-40/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | am 2620f922: (-s ours) am 2b492d53: (-s ours) Import revised translations. ↵Eric Fischer2011-10-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '2620f922b34447c6236d8403af7f5c14e0fe6a16': Import revised translations. DO NOT MERGE
| * | | | | | am 2b492d53: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | | * commit '2b492d5392b58cb39f25dbbcb751b45554f5e5cb': Import revised translations. DO NOT MERGE
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-264-6/+6
| | | |_|/ | | |/| | | | | | | | | | | | Change-Id: I0020670726cabd6727a1c837e9c5527537f87f83
* | | | | am 88842020: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '88842020e75b8e1fd76ce18c2f486636e36af0b4': Import revised translations. DO NOT MERGE
| * | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-2647-860/+860
| |\ \ \ \
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2647-860/+860
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: I148c0854418139512c1c28e8bd0013a61f425d81
* | | | | am 89024e04: Merge "Fixing AppsCustomize paging effect on tablet" into ics-mr1Adam Cohen2011-10-262-4/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '89024e04ab9c78b7e5cf1699f16d813377b480f1': Fixing AppsCustomize paging effect on tablet
| * | | | Merge "Fixing AppsCustomize paging effect on tablet" into ics-mr1Adam Cohen2011-10-252-4/+26
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixing AppsCustomize paging effect on tabletAdam Cohen2011-10-252-4/+26
| | | |/ | | |/| | | | | | | | | Change-Id: I9ec1faeb4efa1b3db338bf47dceee72befbc682e
* | | | am 2dac580d: Merge "Fixing small tablet issues" into ics-mr1Winson Chung2011-10-265-16/+20
|\| | | | | | | | | | | | | | | | | | | * commit '2dac580d5288067061fc6d598072050be4263df7': Fixing small tablet issues
| * | | Merge "Fixing small tablet issues" into ics-mr1Winson Chung2011-10-255-16/+20
| |\ \ \
| | * | | Fixing small tablet issuesWinson Chung2011-10-255-16/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removing phone search container bg from tablet ui - Fixing the tab text for tablet AppsCustomize - Fixing wallpaper items in wallpaper chooser Change-Id: I3424cd8f32a767844b8bed54437f746a0fc381e5
* | | | am 4f3cb091: Merge remote branch \'goog/ics-mr0\' into ics-mr1Ed Heyl2011-10-261-5/+6
|\| | | | | | | | | | | | | | | | | | | * commit '4f3cb091d6ded1e31db8dd21f019073a7cc9a2e2': Updated bug fix for Launcher reloading on mcc update.
| * | | Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-252-6/+7
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Updated bug fix for Launcher reloading on mcc update." into ics-mr0Maarten Hooft2011-10-251-5/+6
| | |\ \
| | | * | Updated bug fix for Launcher reloading on mcc update.Reena Lee2011-10-241-5/+6
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 02:41:34 +0000