Sunny Goyal
387f4a7b36
am fce720f3: Merge "Fixing crash when dragging and dropping a restored widget." into ub-launcher3-almonte
...
* commit 'fce720f39adcf8a35b93978c36ab0e8833a74e3e':
Fixing crash when dragging and dropping a restored widget.
2015-02-17 20:39:42 +00:00
Sunny Goyal
fce720f39a
Merge "Fixing crash when dragging and dropping a restored widget." into ub-launcher3-almonte
2015-02-17 20:34:56 +00:00
Sunny Goyal
2434d40ef2
Fixing crash when dragging and dropping a restored widget.
...
> When the widget is in pending state, AppWidgetProviderInfo is not available
Bug: 19364311
Change-Id: If3126a375853e6e710c6eba4b8824e18f3f0d391
2015-02-17 12:00:30 -08:00
Adam Cohen
97079bc7d5
am 80e6beb4: Ensure that layers are properly removed after animation
...
* commit '80e6beb48ca71a321f667e79fe35a7ab2fb4c2bf':
Ensure that layers are properly removed after animation
2015-02-14 01:05:58 +00:00
Adam Cohen
80e6beb48c
Ensure that layers are properly removed after animation
...
Bug 19243980
Change-Id: Ic1d54f92051f7d937878898cae210ec18ecbaff8
2015-02-13 16:39:10 -08:00
Geoff Mendal
2b8eea15b0
am da6e2ddb: (-s ours) am 875cdbd2: (-s ours) Import translations. DO NOT MERGE
...
* commit 'da6e2ddb5bb9de84d004c726369f767c962adc18':
Import translations. DO NOT MERGE
2015-02-13 01:21:22 +00:00
Geoff Mendal
da6e2ddb5b
am 875cdbd2: (-s ours) Import translations. DO NOT MERGE
...
* commit '875cdbd24b1ab3627d9663a49fcb943cdb5b91b4':
Import translations. DO NOT MERGE
2015-02-13 01:14:55 +00:00
Geoff Mendal
875cdbd24b
Import translations. DO NOT MERGE
...
Change-Id: I2287d714cc1f58f409083c256fa4431dc1e4a918
Auto-generated-cl: translation import
2015-02-12 17:08:33 -08:00
Sunny Goyal
f48e71d116
Merge "Use ResolveInfo for label and icon for LauncherActivityInfo" into ub-launcher3-master
2015-02-12 22:31:10 +00:00
Sunny Goyal
35746d6029
Merge "Removing unused BlockingGLTextureView" into ub-launcher3-master
2015-02-12 22:26:48 +00:00
Sunny Goyal
06a4d3f1af
Moving some files and methods around
...
> Removing android.util package
> Moving static methods and classes out of WallpaperCropActivity
> Removing some unused utility methods
Change-Id: I252a0655ddce195189b6b3f0bf92970e5808c9d7
2015-02-12 12:25:56 -08:00
Sunny Goyal
14334bda03
Merge "Removing code for the unused 'upgrade path'" into ub-launcher3-master
2015-02-12 18:23:28 +00:00
Sunny Goyal
e1b8b2796f
Merge "Fixing last image thumb, being loaded twice" into ub-launcher3-master
2015-02-12 18:19:37 +00:00
Sunny Goyal
c7eef37512
Removing unused BlockingGLTextureView
...
Change-Id: Iac5aec1193e53dd554f61d07201bac06178914f5
2015-02-12 10:13:09 -08:00
Sunny Goyal
fddef4634c
Fixing logic to determine if wallpaper change.
...
> Current logic to determine if livewallpaper changed returns true all the time
> Use returnCode passed by the calling activity.
Change-Id: Ida800a90451b1f7d368234e1a7e10938dcf2f6f7
2015-02-12 10:01:15 -08:00
Sunny Goyal
6f553b975f
Fixing last image thumb, being loaded twice
...
Change-Id: I241e472a3f0869b82066163514fb2c29c0f18a8f
2015-02-12 09:58:04 -08:00
Sunny Goyal
d3f035797e
am c87775d8: Fixing rank migration code to handle null values correctly.
...
* commit 'c87775d8e63c7b5722c23ef95c782f574b847d73':
Fixing rank migration code to handle null values correctly.
2015-02-11 23:01:53 +00:00
Hyunyoung Song
09cd92221e
Remove meaningless bug id from from addDumpLog and Log.d methods
...
b/11683562
b/6557954
Change-Id: Icd0e237ebb09ac868928328f45a3b30cf19a20df
2015-02-11 12:58:33 -08:00
Sunny Goyal
66cfdc2549
Removing code for the unused 'upgrade path'
...
Change-Id: Ib9eca92284b0eabbe36ffaaf26c62a6ce3cfd3e9
2015-02-11 11:55:36 -08:00
Sunny Goyal
54d7d05498
Use ResolveInfo for label and icon for LauncherActivityInfo
...
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
2015-02-11 11:53:44 -08:00
Sunny Goyal
c87775d8e6
Fixing rank migration code to handle null values correctly.
...
Bug: 19297508
Change-Id: I652ef30ab37f5b09204f0388de8e065d64b7724d
2015-02-10 19:53:41 -08:00
Sunny Goyal
3c1865ad50
Using SCREEN_ORIENTATION_LOCKED for locking to current orientation.
...
Bug: 17298128
Change-Id: If64b6957a594bcc48f6454689d11cd63d31b9239
2015-02-10 14:32:55 -08:00
Sunny Goyal
45ba26036b
am 8f9a7879: Launcher crashes on widget bind permission prompt
...
* commit '8f9a787945c3326791c61b001e786b96e9fc4341':
Launcher crashes on widget bind permission prompt
2015-02-06 23:43:42 +00:00
Sunny Goyal
8f9a787945
Launcher crashes on widget bind permission prompt
...
Change-Id: If09feb357e1604e5ee1a66305b022674f466833e
(cherry picked from commit e6b63a3d73 )
2015-02-06 23:38:45 +00:00
Adam Cohen
762d08eead
am bd4a7893: Merge "Revert "Adding Launcher3 callbacks for trimming memory."" into ub-launcher3-almonte
...
* commit 'bd4a78937ffe2f37386dae4ae8817e33422c1267':
Revert "Adding Launcher3 callbacks for trimming memory."
2015-02-06 23:34:26 +00:00
Adam Cohen
bd4a78937f
Merge "Revert "Adding Launcher3 callbacks for trimming memory."" into ub-launcher3-almonte
2015-02-06 23:29:32 +00:00
Adam Cohen
e2d4ee1b21
Revert "Adding Launcher3 callbacks for trimming memory."
...
This reverts commit 42f3b9e028 .
Change-Id: I65a7c893576c0901b231bab9abe6937f99415f1e
2015-02-06 23:28:49 +00:00
Robert Kozikowski
9d083a1c2a
am acbe9f65: Merge "Adding Launcher3 callbacks for trimming memory." into ub-launcher3-almonte
...
* commit 'acbe9f6546455672b2edf51928d4fee4b6e246ba':
Adding Launcher3 callbacks for trimming memory.
2015-02-04 18:41:44 +00:00
Sunny Goyal
980b2f053c
am 4802b410: Adding null-check before parsing an intent
...
* commit '4802b4107a66bc86996083b4835d1094ef4f4cbb':
Adding null-check before parsing an intent
2015-02-04 18:38:36 +00:00
Robert Kozikowski
acbe9f6546
Merge "Adding Launcher3 callbacks for trimming memory." into ub-launcher3-almonte
2015-02-04 18:38:31 +00:00
Sunny Goyal
4802b4107a
Adding null-check before parsing an intent
...
Bug: 18962665
Change-Id: Iae02435f019fa205f3ee3ae721a29f26b3b56dd2
2015-02-04 10:05:47 -08:00
Robert Kozikowski
42f3b9e028
Adding Launcher3 callbacks for trimming memory.
...
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
2015-02-04 15:06:54 +00:00
The Android Automerger
b2b58c8f6c
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-02-03 09:05:59 -08:00
Ying Wang
5be8659972
am 4b0f7dd2: Fix Android.mk.
...
* commit '4b0f7dd2c0c4773606cb583f7f8b42b7bf092366':
Fix Android.mk.
2015-02-02 20:22:25 +00:00
Ying Wang
4b0f7dd2c0
Fix Android.mk.
...
- You don't need to explicitly specify protobuf library; The library
name has been changed and the build system automatically adds it.
- You can't have a file target $(LOCAL_BUILT_MODULE) depend on phony target
launcher_protoutil_lib.
- "include $(call all-makefiles-under,$(LOCAL_PATH))" must be on the
last line.
(cherry picked from commit 3d74c6632e )
Change-Id: I27d967a57d6a9373da50821af32191614a3c8bc7
2015-02-02 11:39:51 -08:00
Jeff Davidson
a5b735f34a
am 123d99f0: Update protobuf library from 2.3 to 2.6.
...
* commit '123d99f0adc85e42fa5c34058719bf362aa20239':
Update protobuf library from 2.3 to 2.6.
2015-02-02 19:30:59 +00:00
Brian Carlstrom
24922acf6d
am dc2e0749: (-s ours) Move from host-libprotobuf-java-2.3.0-nano to current version
...
* commit 'dc2e07493703b7f15c93ea5f383f9fa7fdcf20f1':
Move from host-libprotobuf-java-2.3.0-nano to current version
2015-02-02 19:30:58 +00:00
Jeff Davidson
123d99f0ad
Update protobuf library from 2.3 to 2.6.
...
The dependency here can be removed because it it automatically added
when LOCAL_PROTOC_OPTIMIZE_TYPE=nano by
build/core/host_java_library_common.mk.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2015-02-02 10:39:11 -08:00
Ying Wang
3d74c6632e
Fix Android.mk.
...
- You don't need to explicitly specify protobuf library; The library
name has been changed and the build system automatically adds it.
- You can't have a file target $(LOCAL_BUILT_MODULE) depend on phony target
launcher_protoutil_lib.
- "include $(call all-makefiles-under,$(LOCAL_PATH))" must be on the
last line.
Change-Id: I0d7d7df555f53b5ee5ff2bc5fe2b9e58dbe8a9d5
2015-02-02 10:34:00 -08:00
Geoff Mendal
a2306fce10
Import translations. DO NOT MERGE
...
Change-Id: Id9fffb14666e450ddf0159be048e79e2c0b5bc44
Auto-generated-cl: translation import
2015-02-02 07:52:45 -08:00
Brian Carlstrom
dc2e074937
Move from host-libprotobuf-java-2.3.0-nano to current version
...
Change-Id: I87e768fc95738358eddcca9b524d7546ed632e4b
2015-01-31 22:46:55 -08:00
Sunny Goyal
2d227899de
am c86584b4: am 06a1ff74: am 2fce90c3: Cleaning up icon resizing code
...
* commit 'c86584b440448f51c35416e872e1f59f132fa0bb':
2015-01-31 06:23:01 +00:00
Ian Parkinson
f7fcf0a883
am b0a4ac13: am bc31b328: am 33de9454: am 0c2918f4: Use View.generateViewId if available
...
* commit 'b0a4ac136da6a6bc6185c19373eecc848b673aaa':
2015-01-31 06:23:00 +00:00
Helena Josol
f76838a7d9
am 5af04b6b: am 58acf11f: am b2331f66: Merge "Create a central list of files the Launcher writes to the app directory" into ub-now-queens
...
* commit '5af04b6bc91130e6ec3a38e2590571fcf13bccfa':
2015-01-31 06:22:59 +00:00
Adam Cohen
2c93d7b6d6
am 74971669: am e716c186: am e2f25947: am 4b8d11fc: Add missing xxhdpi asset
...
* commit '74971669995e72cfb8f9c25329adb73ed2bb91da':
2015-01-31 06:22:58 +00:00
Kenny Guy
10bac18946
am 10484dfe: am f108ff0f: am ebb2a66b: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
...
* commit '10484dfe2e431619866b3920368d62c84892d3aa':
2015-01-31 06:22:57 +00:00
Adam Cohen
6e77e0da19
am 7ec1b902: am f08ff22b: am adf571c7: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
...
* commit '7ec1b902bf3bdd6dfae08519db49301f4efc0861':
2015-01-31 06:22:56 +00:00
Bjorn Bringert
7ef9fa7d6e
am b90ed0a9: am 74a8794b: am ebdb7fcc: am 2ed99e86: Build Launcher3 against prebuilt SDK 21
...
* commit 'b90ed0a96d9c8eb93f00aa283d3d550fa92b02a8':
2015-01-31 06:22:55 +00:00
Sunny Goyal
f763e53abb
am f6e5b0c5: am cd2a5a15: am 10d03955: am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
...
* commit 'f6e5b0c54f700c4bccec577d1549204ca7adc760':
2015-01-31 06:22:54 +00:00
Baligh Uddin
a8a49326cd
am bd15704d: (-s ours) am 5702f372: (-s ours) am f82c86c2: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
* commit 'bd15704d42dea8e327fe0071a9a454e409680cf9':
2015-01-31 06:22:53 +00:00