summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fixing logic to determine if wallpaper change." into ub-launcher3-masterSunny Goyal2015-02-202-28/+4
|\
| * Fixing logic to determine if wallpaper change.Sunny Goyal2015-02-122-28/+4
| | | | | | | | | | | | | | > Current logic to determine if livewallpaper changed returns true all the time > Use returnCode passed by the calling activity. Change-Id: Ida800a90451b1f7d368234e1a7e10938dcf2f6f7
* | Merge "Mark WIDGET_CATEGORY_HOME and WIDGET_CATEGORY_SEARCHBOX on the search ↵Adam Cohen2015-02-191-1/+4
|\ \ | | | | | | | | | widget" into ub-launcher3-master
| * | Mark WIDGET_CATEGORY_HOME and WIDGET_CATEGORY_SEARCHBOX on the search widgetAdam Cohen2015-02-181-1/+4
| | | | | | | | | | | | | | | | | | Bug 17334589 Change-Id: I0e14381cfc19822451e68eb7f070d94525e126c3
* | | Merge "Add clip-reveal animation to Launcher" into ub-launcher3-masterChet Haase2015-02-171-3/+51
|\ \ \
| * | | Add clip-reveal animation to LauncherChet Haase2015-02-171-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClipReveal animation was recently added to the platform. This makes that animation the default launch animation when running on that version of the platform. Issue #19362772 Better material launch animations Change-Id: I077659c14dc426be465d163bea6ba0fa93a637c5
* | | | am fce720f3: Merge "Fixing crash when dragging and dropping a restored ↵Sunny Goyal2015-02-172-5/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | widget." into ub-launcher3-almonte * commit 'fce720f39adcf8a35b93978c36ab0e8833a74e3e': Fixing crash when dragging and dropping a restored widget.
| * | | Merge "Fixing crash when dragging and dropping a restored widget." into ↵Sunny Goyal2015-02-172-5/+4
| |\ \ \ | | | | | | | | | | | | | | | ub-launcher3-almonte
| | * | | Fixing crash when dragging and dropping a restored widget.Sunny Goyal2015-02-172-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > When the widget is in pending state, AppWidgetProviderInfo is not available Bug: 19364311 Change-Id: If3126a375853e6e710c6eba4b8824e18f3f0d391
* | | | | am 80e6beb4: Ensure that layers are properly removed after animationAdam Cohen2015-02-142-36/+59
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '80e6beb48ca71a321f667e79fe35a7ab2fb4c2bf': Ensure that layers are properly removed after animation
| * | | | Ensure that layers are properly removed after animationAdam Cohen2015-02-132-36/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 19243980 Change-Id: Ic1d54f92051f7d937878898cae210ec18ecbaff8
* | | | | Merge "Use ResolveInfo for label and icon for LauncherActivityInfo" into ↵Sunny Goyal2015-02-121-22/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-master
| * | | | | Use ResolveInfo for label and icon for LauncherActivityInfoSunny Goyal2015-02-111-22/+23
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the ActivityInfo, use the ResolveInfo so that any label or icon specified on the intent-filter is used. Bug: 18482039 Change-Id: I87c0d9dba0754e3aa2c81727a9f60d789e5e8630
* | | | | Merge "Removing unused BlockingGLTextureView" into ub-launcher3-masterSunny Goyal2015-02-122-540/+11
|\ \ \ \ \
| * | | | | Removing unused BlockingGLTextureViewSunny Goyal2015-02-122-540/+11
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Iac5aec1193e53dd554f61d07201bac06178914f5
* | | | | Merge "Removing code for the unused 'upgrade path'" into ub-launcher3-masterSunny Goyal2015-02-125-237/+36
|\ \ \ \ \
| * | | | | Removing code for the unused 'upgrade path'Sunny Goyal2015-02-115-237/+36
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ib9eca92284b0eabbe36ffaaf26c62a6ce3cfd3e9
* | | | | Merge "Fixing last image thumb, being loaded twice" into ub-launcher3-masterSunny Goyal2015-02-121-2/+1
|\ \ \ \ \
| * | | | | Fixing last image thumb, being loaded twiceSunny Goyal2015-02-121-2/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I241e472a3f0869b82066163514fb2c29c0f18a8f
* | | | | am c87775d8: Fixing rank migration code to handle null values correctly.Sunny Goyal2015-02-111-1/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'c87775d8e63c7b5722c23ef95c782f574b847d73': Fixing rank migration code to handle null values correctly.
| * | | | Fixing rank migration code to handle null values correctly.Sunny Goyal2015-02-101-1/+2
| | |/ / | |/| | | | | | | | | | | | | | Bug: 19297508 Change-Id: I652ef30ab37f5b09204f0388de8e065d64b7724d
* | | | Remove meaningless bug id from from addDumpLog and Log.d methodsHyunyoung Song2015-02-111-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | b/11683562 b/6557954 Change-Id: Icd0e237ebb09ac868928328f45a3b30cf19a20df
* | | | Using SCREEN_ORIENTATION_LOCKED for locking to current orientation.Sunny Goyal2015-02-101-2/+6
| |/ / |/| | | | | | | | | | | Bug: 17298128 Change-Id: If64b6957a594bcc48f6454689d11cd63d31b9239
* | | am 8f9a7879: Launcher crashes on widget bind permission promptSunny Goyal2015-02-060-0/+0
|\| | | | | | | | | | | | | | * commit '8f9a787945c3326791c61b001e786b96e9fc4341': Launcher crashes on widget bind permission prompt
| * | Launcher crashes on widget bind permission promptSunny Goyal2015-02-061-3/+3
| | | | | | | | | | | | | | | Change-Id: If09feb357e1604e5ee1a66305b022674f466833e (cherry picked from commit e6b63a3d7335fed5b7bbcc6d2c6230ae28facd3e)
* | | am bd4a7893: Merge "Revert "Adding Launcher3 callbacks for trimming ↵Adam Cohen2015-02-063-8/+0
|\| | | | | | | | | | | | | | | | | | | | memory."" into ub-launcher3-almonte * commit 'bd4a78937ffe2f37386dae4ae8817e33422c1267': Revert "Adding Launcher3 callbacks for trimming memory."
| * | Merge "Revert "Adding Launcher3 callbacks for trimming memory."" into ↵Adam Cohen2015-02-063-8/+0
| |\ \ | | | | | | | | | | | | ub-launcher3-almonte
| | * | Revert "Adding Launcher3 callbacks for trimming memory."Adam Cohen2015-02-063-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 42f3b9e0283c30c40c286f9958ce0f8b02f85c52. Change-Id: I65a7c893576c0901b231bab9abe6937f99415f1e
* | | | am acbe9f65: Merge "Adding Launcher3 callbacks for trimming memory." into ↵Robert Kozikowski2015-02-043-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-almonte * commit 'acbe9f6546455672b2edf51928d4fee4b6e246ba': Adding Launcher3 callbacks for trimming memory.
| * | | Merge "Adding Launcher3 callbacks for trimming memory." into ↵Robert Kozikowski2015-02-043-0/+8
| |\| | | | | | | | | | | | | | ub-launcher3-almonte
| | * | Adding Launcher3 callbacks for trimming memory.Robert Kozikowski2015-02-043-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will help reduce memory footprint of Launcher, when in background. It is required to help deallocate images, when Google Now Launcher goes into the background. See cl/83222937/ . Change-Id: I6d3d4d1f0457c67abcad3ba4516c87abcf666b05
* | | | am 4802b410: Adding null-check before parsing an intentSunny Goyal2015-02-041-1/+3
|\| | | | | | | | | | | | | | | | | | | * commit '4802b4107a66bc86996083b4835d1094ef4f4cbb': Adding null-check before parsing an intent
| * | | Adding null-check before parsing an intentSunny Goyal2015-02-041-1/+3
| |/ / | | | | | | | | | | | | Bug: 18962665 Change-Id: Iae02435f019fa205f3ee3ae721a29f26b3b56dd2
* | / am b76c165a: Fix ClassCastException due to typoAdam Cohen2015-01-301-1/+1
|\| | | |/ |/| | | | | * commit 'b76c165aadb4deb144ec3b1267aa1faf304638e9': Fix ClassCastException due to typo
| * Fix ClassCastException due to typoAdam Cohen2015-01-301-1/+1
| | | | | | | | | | | | issue 19159790 Change-Id: I5f9fa0e3672c10a460606dcb13b158bd4e614813
* | am a258f812: Modify strict mode thread policy for LauncherProvider.Nilesh Agrawal2015-01-261-1/+1
|\| | | | | | | | | * commit 'a258f812fac21767d1f2e61ee7a7a58bfe6da582': Modify strict mode thread policy for LauncherProvider.
| * Modify strict mode thread policy for LauncherProvider.Nilesh Agrawal2015-01-261-1/+1
| | | | | | | | | | | | | | Allowing thread writes too as SQLiteOpenHelper.getWritableDatabase needs it. Bug: 19094644 Change-Id: I39fe97a9e7fc07c38a4f8e5c5979196b742e36bf
* | am b3e5e4f5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-260-0/+0
|\| | | | | | | | | * commit 'b3e5e4f54125df13863358463f598c224160a13a': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEGeoff Mendal2015-01-261-1/+1
| | | | | | | | | | Change-Id: I0424587be34af78b7720a9a29d09b7e0ba129790 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-01-261-1/+1
| | | | | | | | | | Change-Id: I3902548749f40061c1a9a51f65c082d0bc0a873e Auto-generated-cl: translation import
* | resolved conflicts for merge of b564efb0 to ub-launcher3-masterSunny Goyal2015-01-232-22/+15
|\| | | | | | | Change-Id: I4321522dd1b6b3f96e21232d113fad5144b630bc
| * Adding support for <include> tag in AutoInstall layoutSunny Goyal2015-01-232-22/+15
| | | | | | | | | | Bug: 19121893 Change-Id: I760fa76d6e63c1aa0152e8cd710aba0d6ef4462a
* | Merge "Replacing hotseat icon to an appropriate system app" into ↵Sunny Goyal2015-01-2313-28/+492
|\ \ | | | | | | | | | ub-launcher3-master
| * | Replacing hotseat icon to an appropriate system appSunny Goyal2015-01-2213-28/+492
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > During backupi, store the hotseat target app type, based on some predefined common system apps > During restore, save this app type in the restore flag, if it is a hotseat app > During first launcher load, if an app is not being restored, try to replace it with an appropriate replacement for that type, otherwise delete it. Bug: 18764649 Change-Id: Ic49e40bd707bd8d7de18bbab8b1e58a0a36426a2
* | | am 71701f81: Add project / classpath to gitignoreAdam Cohen2015-01-231-0/+2
|\ \ \ | | |/ | |/| | | | | | | * commit '71701f8145f0eb1017b2d3590fc87babad1d1bd3': Add project / classpath to gitignore
| * | Add project / classpath to gitignoreAdam Cohen2015-01-221-0/+2
| | | | | | | | | | | | Change-Id: I157d480ebaa6d3873d03fd547fe4a8e4a4e9e015
* | | am fde11852: Add strict mode exception in LauncherProvider.Nilesh Agrawal2015-01-211-0/+3
|\| | | | | | | | | | | | | | * commit 'fde11852cf0f91c4500a93dfffb44c1b86991e6e': Add strict mode exception in LauncherProvider.
| * | Add strict mode exception in LauncherProvider.Nilesh Agrawal2015-01-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Content providers are created during process startup (before Application.onCreate), and we should not be doing expensive stuff in Provider.onCreate Adding an exception for now as it looks like LauncherProvider initialization is needed before we can show meaningful UI. Bug: 19094644 Change-Id: I860c2934c110d3a43f1a3afa00729077dc64796c
* | | Changing DB upgrade path to use swith case statement.Sunny Goyal2015-01-211-104/+86
| |/ |/| | | | | | | | | | | > This allows to cancel the whole upgrade path if any one step fails and reset the DB Change-Id: I645b74af8afcd21dda0d619691a5fb3dbf1a04c0
* | am f32cd5fb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-210-0/+0
|\| | | | | | | | | * commit 'f32cd5fbbb7b7ec1753606669c8936fd956df494': Import translations. DO NOT MERGE