summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-03-091-1/+1
| | | | | Change-Id: Iff3cfd7f43663f7fc777da5c1971da7b8608d952 Auto-generated-cl: translation import
* am 58afc354: (-s ours) am 729ad90f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
|\ | | | | | | | | * commit '58afc3547e1b05175153a20d8d340ce3ee97ba7d': Import translations. DO NOT MERGE
| * am 729ad90f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
| |\ | | | | | | | | | | | | * commit '729ad90fb6c1b5c7c6e79507beb00934fbdd44ea': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-2625-14/+628
| |/ | | | | | | | | Change-Id: Ibdacd9febbe2e1d8a282af7a856d27fbffb1014c Auto-generated-cl: translation import
* | am da6e2ddb: (-s ours) am 875cdbd2: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-130-0/+0
|\| | | | | | | | | * commit 'da6e2ddb5bb9de84d004c726369f767c962adc18': Import translations. DO NOT MERGE
| * am 875cdbd2: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-130-0/+0
| |\ | | | | | | | | | | | | * commit '875cdbd24b1ab3627d9663a49fcb943cdb5b91b4': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-1224-13/+627
| | | | | | | | | | | | | | | Change-Id: I2287d714cc1f58f409083c256fa4431dc1e4a918 Auto-generated-cl: translation import
* | | am 4b0f7dd2: Fix Android.mk.Ying Wang2015-02-020-0/+0
|\| | | | | | | | | | | | | | * commit '4b0f7dd2c0c4773606cb583f7f8b42b7bf092366': Fix Android.mk.
| * | Fix Android.mk.Ying Wang2015-02-021-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 3d74c6632ed6ab23db0cde80bc8a61daecfd49ef) Change-Id: I27d967a57d6a9373da50821af32191614a3c8bc7
* | | am 123d99f0: Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-02-020-0/+0
|\| | | | | | | | | | | | | | * commit '123d99f0adc85e42fa5c34058719bf362aa20239': Update protobuf library from 2.3 to 2.6.
| * | Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-02-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am dc2e0749: (-s ours) Move from host-libprotobuf-java-2.3.0-nano to current ↵Brian Carlstrom2015-02-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | version * commit 'dc2e07493703b7f15c93ea5f383f9fa7fdcf20f1': Move from host-libprotobuf-java-2.3.0-nano to current version
| * | Move from host-libprotobuf-java-2.3.0-nano to current versionBrian Carlstrom2015-01-311-1/+1
| |/ | | | | | | Change-Id: I87e768fc95738358eddcca9b524d7546ed632e4b
* | Fix Android.mk.Ying Wang2015-02-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | - 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
* | Import translations. DO NOT MERGEGeoff Mendal2015-02-0224-13/+627
| | | | | | | | | | Change-Id: Id9fffb14666e450ddf0159be048e79e2c0b5bc44 Auto-generated-cl: translation import
* | am c86584b4: am 06a1ff74: am 2fce90c3: Cleaning up icon resizing codeSunny Goyal2015-01-310-0/+0
|\ \ | | | | | | | | | * commit 'c86584b440448f51c35416e872e1f59f132fa0bb':
| * \ am 06a1ff74: am 2fce90c3: Cleaning up icon resizing codeSunny Goyal2015-01-314-56/+15
| |\ \ | | | | | | | | | | | | | | | | * commit '06a1ff7467bee1d9587c604c59ac5d53b42617f7': Cleaning up icon resizing code
| | * \ am 2fce90c3: Cleaning up icon resizing codeSunny Goyal2015-01-314-56/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '2fce90c38a79d318e96a28107dea287e42509861': Cleaning up icon resizing code
* | | | | am b0a4ac13: am bc31b328: am 33de9454: am 0c2918f4: Use View.generateViewId ↵Ian Parkinson2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | if available * commit 'b0a4ac136da6a6bc6185c19373eecc848b673aaa':
| * | | | am bc31b328: am 33de9454: am 0c2918f4: Use View.generateViewId if availableIan Parkinson2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'bc31b328f70866136a286b3a2b84de4eeb15c687':
| | * | | am 33de9454: am 0c2918f4: Use View.generateViewId if availableIan Parkinson2015-01-310-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | * commit '33de945451e1380eff2f4c6cd3aa5bb32c0ad368':
* | | | | | am 5af04b6b: am 58acf11f: am b2331f66: Merge "Create a central list of files ↵Helena Josol2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Launcher writes to the app directory" into ub-now-queens * commit '5af04b6bc91130e6ec3a38e2590571fcf13bccfa':
| * | | | | am 58acf11f: am b2331f66: Merge "Create a central list of files the Launcher ↵Helena Josol2015-01-315-13/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | writes to the app directory" into ub-now-queens * commit '58acf11fbc36338b0664837de4007ad1f467ad23': Create a central list of files the Launcher writes to the app directory
| | * | | | am b2331f66: Merge "Create a central list of files the Launcher writes to ↵Helena Josol2015-01-315-13/+39
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the app directory" into ub-now-queens * commit 'b2331f6601d26cf042e70070e1ef32fe06827f4d': Create a central list of files the Launcher writes to the app directory
* | | | | | | am 74971669: am e716c186: am e2f25947: am 4b8d11fc: Add missing xxhdpi assetAdam Cohen2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74971669995e72cfb8f9c25329adb73ed2bb91da':
| * | | | | | am e716c186: am e2f25947: am 4b8d11fc: Add missing xxhdpi assetAdam Cohen2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e716c1864538537f97591b926affccf28408201e':
| | * | | | | am e2f25947: am 4b8d11fc: Add missing xxhdpi assetAdam Cohen2015-01-310-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2f25947844e7cd1f28c367eade49038347c658d':
* | | | | | | | am 10484dfe: am f108ff0f: am ebb2a66b: am 0cd27191: Merge "Remove reference ↵Kenny Guy2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to CODENAME from compat code." into ub-now-porkchop * commit '10484dfe2e431619866b3920368d62c84892d3aa':
| * | | | | | | am f108ff0f: am ebb2a66b: am 0cd27191: Merge "Remove reference to CODENAME ↵Kenny Guy2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from compat code." into ub-now-porkchop * commit 'f108ff0f646479731ee7b818958f7b787b151c55':
| | * | | | | | am ebb2a66b: am 0cd27191: Merge "Remove reference to CODENAME from compat ↵Kenny Guy2015-01-310-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code." into ub-now-porkchop * commit 'ebb2a66b79b2761ed29f2f8a3140217c126e448b':
* | | | | | | | | am 7ec1b902: am f08ff22b: am adf571c7: am 52077b7a: Merge "Don\'t let old ↵Adam Cohen2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Launcher activity interfere with new one" into ub-now-porkchop * commit '7ec1b902bf3bdd6dfae08519db49301f4efc0861':
| * | | | | | | | am f08ff22b: am adf571c7: am 52077b7a: Merge "Don\'t let old Launcher ↵Adam Cohen2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity interfere with new one" into ub-now-porkchop * commit 'f08ff22bc3ea2c12015040071dbc68abda13f4bb':
| | * | | | | | | am adf571c7: am 52077b7a: Merge "Don\'t let old Launcher activity interfere ↵Adam Cohen2015-01-310-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with new one" into ub-now-porkchop * commit 'adf571c7725f0281a3e37a4b6254818da956ca53':
* | | | | | | | | | am b90ed0a9: am 74a8794b: am ebdb7fcc: am 2ed99e86: Build Launcher3 against ↵Bjorn Bringert2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prebuilt SDK 21 * commit 'b90ed0a96d9c8eb93f00aa283d3d550fa92b02a8':
| * | | | | | | | | am 74a8794b: am ebdb7fcc: am 2ed99e86: Build Launcher3 against prebuilt SDK 21Bjorn Bringert2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74a8794b436679ac6d6149535da31955b2a952c3':
| | * | | | | | | | am ebdb7fcc: am 2ed99e86: Build Launcher3 against prebuilt SDK 21Bjorn Bringert2015-01-310-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ebdb7fcc8ca851390bcf276929e8990ba23b6869':
* | | | | | | | | | | am f6e5b0c5: am cd2a5a15: am 10d03955: am 6d467e27: Merge "Resetting ↵Sunny Goyal2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | launcherProvider data if restore set was empty" into ub-now-porkchop * commit 'f6e5b0c54f700c4bccec577d1549204ca7adc760':
| * | | | | | | | | | am cd2a5a15: am 10d03955: am 6d467e27: Merge "Resetting launcherProvider ↵Sunny Goyal2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data if restore set was empty" into ub-now-porkchop * commit 'cd2a5a15c0ff9df4e25056373202a235517d6427':
| | * | | | | | | | | am 10d03955: am 6d467e27: Merge "Resetting launcherProvider data if restore ↵Sunny Goyal2015-01-310-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set was empty" into ub-now-porkchop * commit '10d03955def60ffa28717cd113c74a18219e2e81':
* | | | | | | | | | | | am bd15704d: (-s ours) am 5702f372: (-s ours) am f82c86c2: (-s ours) am ↵Baligh Uddin2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'bd15704d42dea8e327fe0071a9a454e409680cf9':
| * | | | | | | | | | | am 5702f372: (-s ours) am f82c86c2: (-s ours) am 10047138: (-s ours) Merge ↵Baligh Uddin2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '5702f372a016128cd60edd24501c82e2b2ce1be8':
| | * | | | | | | | | | am f82c86c2: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2015-01-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into ub-now-porkchop * commit 'f82c86c26c0ba9896b61270b48a8e4f82d7d7fde':
* | | | | | | | | | | | | am 59034e7f: am 542a1bc4: am fdff96d3: am c5fb59fb: Fixing loadWorkspace ↵Sunny Goyal2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being called multiple times Using right intent when refreshing shortcut icons * commit '59034e7f24af8da64c0ab46bbe4321afbb4d09e1':
| * | | | | | | | | | | | am 542a1bc4: am fdff96d3: am c5fb59fb: Fixing loadWorkspace being called ↵Sunny Goyal2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple times Using right intent when refreshing shortcut icons * commit '542a1bc477bcaf28e40ede88d3a61c46e46940fe':
| | * | | | | | | | | | | am fdff96d3: am c5fb59fb: Fixing loadWorkspace being called multiple times ↵Sunny Goyal2015-01-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using right intent when refreshing shortcut icons * commit 'fdff96d385fdbbcb1d0a49853e89d60211a48cc7':
* | | | | | | | | | | | | | am 445b4825: am fdd9df33: am e9461be3: am f876301d: UI FixesSunny Goyal2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '445b48254335f6de9103789273372701d8efb79a':
| * | | | | | | | | | | | | am fdd9df33: am e9461be3: am f876301d: UI FixesSunny Goyal2015-01-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fdd9df33a7be3613de5ac75931397735b47b240c':
| | * | | | | | | | | | | | am e9461be3: am f876301d: UI FixesSunny Goyal2015-01-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9461be3cfc7fd5b8956b84aea3184474c366eba':
* | | | | | | | | | | | | | | am bde41be6: am 6b3c7757: am 8fd74831: Source change to get code compiling ↵Sameer Padala2015-01-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on google3 * commit 'bde41be6d998a4520332f16ef0072e08a86a0a6f':
| * | | | | | | | | | | | | | am 6b3c7757: am 8fd74831: Source change to get code compiling on google3Sameer Padala2015-01-313-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b3c775727d55a0aa5b25d0ea89b939b71624cd2': Source change to get code compiling on google3
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 13:11:37 +0000