summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 13ef17a3 to mnc-dr-devHyunyoung Song2015-07-22630-21563/+23677
| | | | | b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
* am e5ec4ac4: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
|\ | | | | | | | | * commit 'e5ec4ac409eb3d3169bb9350dfda51ae7e08291e': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEGeoff Mendal2015-07-1514-28/+28
| | | | | | | | | | Change-Id: Ibaeb926647e035d8c46ca07c7a2e7d535050fb87 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-07-1112-20/+20
|/ | | | | Change-Id: I7eaa0e72278a82d50a0fb1cd628109af61b88acf Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-05-304-2/+162
| | | | | Change-Id: Id8b8584b48327e773693a700dbbf4b5934dbd8b4 Auto-generated-cl: translation import
* Enable Launcher3 as default Home appbohu2015-05-211-1/+1
| | | | | | | | The default Home app launcher2 is deprecated and cannot launch Nexus 6 or any other high resolution devices in emulator. This CL enables launcher3 as the default Home app, since it can handle Nexus 6 and is well maintained. Change-Id: Iaba545fec218f79e40e0f72de5236ddadfabaa14
* Import translations. DO NOT MERGEGeoff Mendal2015-05-142-4/+4
| | | | | Change-Id: I04d830524cf0903d9cf77874039a3f7a9a165ce9 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-04-226-0/+480
| | | | | Change-Id: I3a26b2cea1c07962922548e026933df4a52bda4e Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-04-081-1/+1
| | | | | Change-Id: I5ff488d79f81ff68e200e1a3438ad2455ffb1b65 Auto-generated-cl: translation import
* am 51160caf: (-s ours) am aae99eaa: am b2b58c8f: merge in ↵The Android Automerger2015-03-260-0/+0
|\ | | | | | | | | | | lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev * commit '51160caf9cb3f85a5ad3e89cbf794563c017c7af':
| * am aae99eaa: am b2b58c8f: merge in lmp-mr1-sdk-release history after reset ↵The Android Automerger2015-03-260-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | to lmp-mr1-ub-dev * commit 'aae99eaa148ad74efbcd1519cc34363823e3c560': fix build fix build
| | * am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-03-260-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | * commit 'b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b': fix build fix build
| | | * merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-devThe Android Automerger2015-02-030-0/+0
| | | |\
* | | | \ Merge "Revert "Configuration of workspace through app restrictions""Sunny Goyal2015-03-262-76/+5
|\ \ \ \ \
| * | | | | Revert "Configuration of workspace through app restrictions"Sunny Goyal2015-03-262-76/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2a27d9f709282ec298440b010575c5950985c591. The change should go in ub-launcher3-burnaby Change-Id: Ib405972434ad4e409d49a5b4850ddefcf3cbd589
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idaaf04ffb983983fb8b9856954a2fa49cac5197e Auto-generated-cl: translation import
* | | | | | Merge "Configuration of workspace through app restrictions"Andrei Kapishnikov2015-03-232-5/+76
|\| | | | |
| * | | | | Configuration of workspace through app restrictionsAndrei Kapishnikov2015-03-232-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more details see: https://docs.google.com/document/d/19fresMENpmW3Xb5avNowWzN_o4Q27TZy9J_dsiMEDBE Change-Id: Ifec039750aabafbcbc9d928640ac140e588affc8
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-212-0/+160
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I1e04e82c7ab16d948fd15adb5688e452211256df Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-161-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic09f9d222e3759b27815aeb8d4c8e7a5ccb7cfb4 Auto-generated-cl: translation import
* | | | | 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':
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 00:01:28 +0000