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
Sunny Goyal
19f2e7b562
am 59034e7f: am 542a1bc4: am fdff96d3: am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
...
* commit '59034e7f24af8da64c0ab46bbe4321afbb4d09e1':
2015-01-31 06:22:52 +00:00
Sunny Goyal
1a2295c365
am 445b4825: am fdd9df33: am e9461be3: am f876301d: UI Fixes
...
* commit '445b48254335f6de9103789273372701d8efb79a':
2015-01-31 06:22:51 +00:00
Sameer Padala
fc18d3a83e
am bde41be6: am 6b3c7757: am 8fd74831: Source change to get code compiling on google3
...
* commit 'bde41be6d998a4520332f16ef0072e08a86a0a6f':
2015-01-31 06:22:50 +00:00
Adam Cohen
85c17711e0
am c79518f3: am ab5af008: am 12429e46: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
...
* commit 'c79518f3005756615df68729313d96cf65cb20f8':
2015-01-31 06:22:49 +00:00
Baligh Uddin
920971ab07
am e41059eb: (-s ours) am ee82d2f2: (-s ours) am a703eb0f: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
* commit 'e41059eb983e787ef68fddb0f4c2c1ead7f88944':
2015-01-31 06:22:48 +00:00
Baligh Uddin
02f10e501b
am 990e5810: (-s ours) am eaa035fb: (-s ours) am 153c3ddc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens
...
* commit '990e58107eda2a925b2571293b403dc1df2a08df':
2015-01-31 06:22:46 +00:00
Sunny Goyal
3af4d76f29
am 2bccd31a: am f7e3bf98: am f2316a73: am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop
...
* commit '2bccd31abea962113ddfd0973a64f406ef54b61c':
2015-01-31 06:22:45 +00:00
Sunny Goyal
315967a6fa
am 7a788c7a: am 2f347b44: am 06f4dc5d: am 7e053f87: Merge "Changing intent action for auto installs" into ub-now-porkchop
...
* commit '7a788c7a509818ee363fc05406997e37d5bc17cf':
2015-01-31 06:22:44 +00:00
Sunny Goyal
a10366cb08
am 371c42ac: am 3d567ad5: am cb0ec764: am 66af82cc: Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop
...
* commit '371c42ac91f32e666f8a6ca7528c9341b7990a5d':
2015-01-31 06:22:43 +00:00
Sunny Goyal
ec6ca387e8
am 4d70e266: am b9fd1ef3: am 2e9eb2a6: am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there is no migration cling" into ub-now-porkchop
...
* commit '4d70e266a580f3acc1cc1f1722357a99a38778bb':
2015-01-31 06:22:42 +00:00
Adam Cohen
f3847c7d06
am 0736b9c4: am bab1243e: am 0d89e1d7: am ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop
...
* commit '0736b9c4c0b6df9ada82d39f4a8cf70c98849b13':
2015-01-31 06:22:41 +00:00
Kenny Guy
340e61073b
am 398ccb60: am eb1540a5: am e4bafbb3: am c0b89b72: Merge "Update calls now we have an L API version." into ub-now-porkchop
...
* commit '398ccb6023891fb3fd43f16e2367ab468eacc4c6':
2015-01-31 06:22:40 +00:00
Kenny Guy
62264f1f0d
am a0bf755f: am 220b4710: am a7b95f2a: am 850d471b: Remove catch now api has hit googlefood.
...
* commit 'a0bf755f3be659aee3bc572c7b0f9320901b83d7':
2015-01-31 06:22:39 +00:00
Adam Cohen
65439fe5a3
am 30f36a0a: am 64ca9c1a: am 90f9f957: am 83e5941d: Fix NPE in Workspace
...
* commit '30f36a0a8e47b1235935dc442abbdab0420ffde0':
2015-01-31 06:22:38 +00:00
Sunny Goyal
d6c087f06e
am 4c8e36f6: am 31196bbe: am 3fcb2c75: am 136882c1: Merge "Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver" into ub-now-porkchop
...
* commit '4c8e36f654f2526c3e36e9d4a2c1ed0398514680':
2015-01-31 06:22:37 +00:00
Sunny Goyal
60854ede41
am bbe19998: am ee9ea9c8: am 7b0982d8: am d8293fbf: Merge "Null check in flushInvalidIcons" into ub-now-porkchop
...
* commit 'bbe199985b2f3ef932111c0d679d4f1e308879bf':
2015-01-31 06:22:36 +00:00
Sunny Goyal
a033feb080
am 011639a8: am 8b5274e7: am 4824965f: am 16fe1dfd: Merge "Updating shourcuts only when the corresponding user also matches the AppInfo" into ub-now-porkchop
...
* commit '011639a83e46908134416a8f7e1686dc7852d17d':
2015-01-31 06:22:35 +00:00
Sunny Goyal
196aa423ca
am 0859ac57: am 1bbf4013: am bc60df98: am 72f98657: Merge "Using ApplicationContext in static objects" into ub-now-porkchop
...
* commit '0859ac57e1938a5a7f4f85a4cc1e37c22d7303df':
2015-01-31 06:22:34 +00:00
Dharmesh Mokani
b2aee64e40
am 6ac9c68e: am 67eac8d0: am ae5c0ad2: am cc4e84ee: Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchop
...
* commit '6ac9c68e4e214c57a69ae95f8c3a1f0cde27116f':
2015-01-31 06:22:33 +00:00
Sunny Goyal
c9c8bbc8b5
am cb9343d0: am 5dd8958b: am 88a6301e: am a20490cd: Merge "Disabling debug logs" into ub-now-porkchop
...
* commit 'cb9343d085689eb71df83757fe004afb0478b775':
2015-01-31 06:22:32 +00:00
Sunny Goyal
f6616e1d39
am 7f89291d: am c0c642ad: am 97205636: am 6a229267: Merge "Updating screenpanel assets" into ub-now-porkchop
...
* commit '7f89291dc3f443080ff153040b2c79c5b08b7dfc':
2015-01-31 06:22:30 +00:00
Sunny Goyal
633cc69023
am bdf6d51b: am bd190063: am 8b808c71: am 10c7764d: Updating margin and content size for migration cling
...
* commit 'bdf6d51bcb1db3af190be34823eef7eb3d2fc732':
2015-01-31 06:22:29 +00:00
Chris Wren
750618259b
am 6d6ab373: am 5c810768: am 05702ccf: am 5b7d28fc: Merge "Turn off debugging for launch." into ub-now-porkchop
...
* commit '6d6ab373c3e2990b2966731bed08dae3d7863c10':
2015-01-31 06:22:28 +00:00
Sunny Goyal
941197f0f1
am 8759c5e4: am 663d1511: am 6c589c27: Merge "Fixing wrong views being made visible when opening all apps" into ub-now-porkchop automerge: 37b44cc
...
* commit '8759c5e404c66653b91b7f05948e0ba1caed4a00':
2015-01-31 06:22:27 +00:00
Kenny Guy
d538837e03
am 1e3ccd06: am bbdd20fd: am fb7eae5a: Merge "Update compat layer for API review changes to LauncherApps" into ub-now-porkchop automerge: cb213ba
...
* commit '1e3ccd0648b2d4c2f9a3fee2a7782aea685566dc':
2015-01-31 06:22:26 +00:00
Dharmesh Mokani
8dbbab27c6
am 463eee63: am 841607a4: am d23e2cda: am 393afd34: Dogfood Crash Loop : Fixing crash loop by try and catch
...
* commit '463eee63bd2d37b5b14910e8e8a953a6729afbef':
2015-01-31 06:22:25 +00:00
Kenny Guy
2b9eb6a02a
am 6e9b4d24: am c73c0900: am d4aeed33: am 49909c2b: Catch Throwable as NoSuchMethodError isn\'t an Exception.
...
* commit '6e9b4d24354bd02cf5910029e77b2150a71174f1':
2015-01-31 06:22:24 +00:00