Commit Graph

10645 Commits

Author SHA1 Message Date
Neil Fuller f96d6fa4a1 Remove usage of FloatMath
Cherry pick of commit ba41458f5c
plus changes to BitmapUtils.java.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I2effc3f498fb13e66de9a905b9a40ac5688a5850
2015-04-22 16:16:16 +00:00
Geoff Mendal 11b848bb4a Import translations. DO NOT MERGE
Change-Id: I3a26b2cea1c07962922548e026933df4a52bda4e
Auto-generated-cl: translation import
2015-04-22 08:01:14 -07:00
Geoff Mendal 2f6d7f6764 Import translations. DO NOT MERGE
Change-Id: I5ff488d79f81ff68e200e1a3438ad2455ffb1b65
Auto-generated-cl: translation import
2015-04-08 08:13:03 -07:00
The Android Automerger 1b92a0f66d am 51160caf: (-s ours) am aae99eaa: am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '51160caf9cb3f85a5ad3e89cbf794563c017c7af':
2015-03-26 22:38:08 +00:00
The Android Automerger 51160caf9c am aae99eaa: am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit 'aae99eaa148ad74efbcd1519cc34363823e3c560':
  fix build
  fix build
2015-03-26 21:19:47 +00:00
The Android Automerger aae99eaa14 am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit 'b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b':
  fix build
  fix build
2015-03-26 21:00:22 +00:00
Sunny Goyal 511f9dfce6 Merge "Revert "Configuration of workspace through app restrictions"" 2015-03-26 18:11:38 +00:00
Sunny Goyal f795f7a8f8 Revert "Configuration of workspace through app restrictions"
This reverts commit 2a27d9f709.

The change should go in ub-launcher3-burnaby

Change-Id: Ib405972434ad4e409d49a5b4850ddefcf3cbd589
2015-03-26 17:55:44 +00:00
Geoff Mendal 654d111044 Import translations. DO NOT MERGE
Change-Id: Idaaf04ffb983983fb8b9856954a2fa49cac5197e
Auto-generated-cl: translation import
2015-03-25 08:19:58 -07:00
Andrei Kapishnikov 33cbdfa46a Merge "Configuration of workspace through app restrictions" 2015-03-23 18:43:56 +00:00
Andrei Kapishnikov 2a27d9f709 Configuration of workspace through app restrictions
For more details see: https://docs.google.com/document/d/19fresMENpmW3Xb5avNowWzN_o4Q27TZy9J_dsiMEDBE

Change-Id: Ifec039750aabafbcbc9d928640ac140e588affc8
2015-03-23 10:44:51 -04:00
Geoff Mendal b168ad7164 Import translations. DO NOT MERGE
Change-Id: I1e04e82c7ab16d948fd15adb5688e452211256df
Auto-generated-cl: translation import
2015-03-21 05:31:31 -07:00
Geoff Mendal 2c09f747a7 Import translations. DO NOT MERGE
Change-Id: Ic09f9d222e3759b27815aeb8d4c8e7a5ccb7cfb4
Auto-generated-cl: translation import
2015-03-16 08:53:14 -07:00
Geoff Mendal f00dc09662 Import translations. DO NOT MERGE
Change-Id: Iff3cfd7f43663f7fc777da5c1971da7b8608d952
Auto-generated-cl: translation import
2015-03-09 09:57:30 -07:00
Geoff Mendal acf1ddda6d am 58afc354: (-s ours) am 729ad90f: (-s ours) Import translations. DO NOT MERGE
* commit '58afc3547e1b05175153a20d8d340ce3ee97ba7d':
  Import translations. DO NOT MERGE
2015-02-26 23:25:41 +00:00
Geoff Mendal 58afc3547e am 729ad90f: (-s ours) Import translations. DO NOT MERGE
* commit '729ad90fb6c1b5c7c6e79507beb00934fbdd44ea':
  Import translations. DO NOT MERGE
2015-02-26 23:14:50 +00:00
Geoff Mendal 729ad90fb6 Import translations. DO NOT MERGE
Change-Id: Ibdacd9febbe2e1d8a282af7a856d27fbffb1014c
Auto-generated-cl: translation import
2015-02-26 13:21:32 -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
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