Commit Graph

8936 Commits

Author SHA1 Message Date
Adam Cohen a5eae84cbf am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8
am: 6d0a93207e

* commit '6d0a93207ebb2ed8380e398ca3ecc5965975c778':
2015-10-20 00:54:55 +00:00
Adam Cohen 20053bc691 am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4
am: 313c1de1cc

* commit '313c1de1cc69d9d4b59fd2b2f88fdba26bc8d4de':
2015-10-20 00:54:51 +00:00
Sunny Goyal 153ccdf5ee am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours
am: 852a96562a

* commit '852a96562af274cb6768f7370436d632fcf7ed05':
2015-10-20 00:54:48 +00:00
Ian Parkinson ceb823f9ec am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd
am: 8374915b27

* commit '8374915b27e98f02a6a0a3e61ad3085c7635226d':
2015-10-20 00:54:44 +00:00
Adam Cohen 53e87e86c2 am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2
am: a42854b9b4

* commit 'a42854b9b44a188f76ffa41f5e2fa0f54a39b2f6':
2015-10-20 00:54:41 +00:00
Kenny Guy e431703711 am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c
am: 689cb6366b

* commit '689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3':
2015-10-20 00:54:37 +00:00
Adam Cohen b75de587c5 am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5
am: 7e88e90afc

* commit '7e88e90afc2fce3e64735ee0f11b9098193253d3':
2015-10-20 00:54:31 +00:00
Bjorn Bringert 5a7f0e0527 am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c
am: 867cd087e3

* commit '867cd087e32ac224ad87145f0b446a5606de0afe':
2015-10-20 00:54:27 +00:00
Sunny Goyal ab1bfbf928 am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943
am: 5d36c5b03b

* commit '5d36c5b03bbbd2906a74e4c9c17faa74f5d4c4ec':
2015-10-20 00:54:23 +00:00
Baligh Uddin 56985a1867 am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce -s ours
am: eb8ce94244  -s ours

* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':
2015-10-20 00:54:18 +00:00
Sunny Goyal f321db6800 am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c
am: ffe21b3129

* commit 'ffe21b31295b2195b219372394096253dda64e89':
2015-10-20 00:54:14 +00:00
Sunny Goyal 718278e9f4 am f876301d: UI Fixes am: 501414523e
am: 2f22fa892b

* commit '2f22fa892bb4cc40d26353cb8946d2a00a26eac4':
2015-10-20 00:54:08 +00:00
Adam Cohen 278d4d2d5a am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a18
am: 86b4730bb5

* commit '86b4730bb5217268c3abd4444c34b2876a7c3ebc':
2015-10-20 00:54:03 +00:00
Baligh Uddin 669ef65afb am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19 -s ours
am: bfe4347964  -s ours

* commit 'bfe43479643fece25c8aeabb64b90ca9d6c028be':
2015-10-20 00:53:58 +00:00
Adam Cohen 6d0a93207e am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
am: e7afa51bd8

* commit 'e7afa51bd8f0f0b9f21bd63a9ceeb9f330259fc2':
2015-10-20 00:29:19 +00:00
Adam Cohen 313c1de1cc am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
am: 84a79949a4

* commit '84a79949a478f8b91c7fcc9346525f7dd187f548':
2015-10-20 00:29:15 +00:00
Sunny Goyal 852a96562a am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
am: fdbfba88d4  -s ours

* commit 'fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':
2015-10-20 00:29:10 +00:00
Ian Parkinson 8374915b27 am 0c2918f4: Use View.generateViewId if available
am: 3d78b80ecd

* commit '3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
2015-10-20 00:29:04 +00:00
Adam Cohen a42854b9b4 am 4b8d11fc: Add missing xxhdpi asset
am: 49e2f10ee2

* commit '49e2f10ee205d6190f0d4c589ba31b6763e9b0d3':
2015-10-20 00:28:59 +00:00
Kenny Guy 689cb6366b am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
am: 5f2a520f0c

* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':
2015-10-20 00:28:53 +00:00
Adam Cohen 7e88e90afc am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
am: 91c11b28d5

* commit '91c11b28d57c026d507488c58feedebf7fee6f31':
2015-10-20 00:28:44 +00:00
Bjorn Bringert 867cd087e3 am 2ed99e86: Build Launcher3 against prebuilt SDK 21
am: c656245b9c

* commit 'c656245b9cbc370537afb18e7fb38ea87c233fd1':
2015-10-20 00:28:36 +00:00
Sunny Goyal 5d36c5b03b am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
am: e7599d6943

* commit 'e7599d694313845a41221dfa0d7f6dca3aedd02c':
2015-10-20 00:28:30 +00:00
Baligh Uddin eb8ce94244 am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am: ab474588ce  -s ours

* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
2015-10-20 00:28:25 +00:00
Sunny Goyal ffe21b3129 am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
am: e43f0d646c

* commit 'e43f0d646c60c6f59333224686725717cdf2ccbc':
2015-10-20 00:28:19 +00:00
Sunny Goyal 2f22fa892b am f876301d: UI Fixes
am: 501414523e

* commit '501414523ef1e3dc394746ea01489a934e826865':
2015-10-20 00:28:14 +00:00
Adam Cohen 86b4730bb5 am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
am: cb20616a18

* commit 'cb20616a180de2855cc35e6c1ce8dfb8082ea41c':
2015-10-20 00:28:06 +00:00
Baligh Uddin bfe4347964 am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am: 6317598a19  -s ours

* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':
2015-10-20 00:28:00 +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
Nick Kralevich ce0117dc59 fix build
Bug: 18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb
2015-01-30 14:24:47 -08:00
Nick Kralevich 6c5b4a9420 fix build
Bug: 18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7
2015-01-30 14:24:40 -08:00
The Android Automerger 4a6287da0f merge in ub-now-queens-release history after reset to ub-now-queens 2014-12-09 01:22:44 +00:00
Geoff Mendal e578ad8d93 Import translations. DO NOT MERGE
Change-Id: I5afb7119527734723b3bd4e35e66844b62f74d95
Auto-generated-cl: translation import
2014-12-08 11:16:09 -08:00
Adam Cohen 0250945759 Avoid db exception on L and above
Bug 18554839

Change-Id: I43f391b7cc376f697ce7b5b363e8be3aa85814b5
2014-12-04 10:35:52 -08:00
Adam Cohen 2975e34145 am d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
* commit 'd2285942dde8f2633f1d79abc01e598da7925090':
  Ignoring specific db exception DO NOT MERGE
2014-12-04 18:17:52 +00:00
Adam Cohen d2285942dd Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop 2014-12-04 18:14:22 +00:00
Winson Chung 18ce985698 Ignoring specific db exception DO NOT MERGE
Bug 18554839.

Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
(cherry picked from commit 5f05913f71)
2014-12-04 10:04:30 -08:00
The Android Automerger 5e21d583c8 merge in ub-now-queens-release history after reset to ub-now-queens 2014-12-04 17:56:30 +00:00
Adam Cohen e6673dc1fa am 268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete
* commit '268b8907d1f2fcf9775880c69899b3c6fbe85ea3':
  Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
2014-12-04 17:34:10 +00:00
Adam Cohen 268b8907d1 Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Bug: 18567716

Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
(cherry picked from commit 5c18b80ed9)
2014-12-04 17:21:12 +00:00
Geoff Mendal 2f805f0d00 Merge "Import translations. DO NOT MERGE" into ub-now-queens 2014-12-04 05:28:02 +00:00
Geoff Mendal 917a33eb1a Import translations. DO NOT MERGE
Change-Id: If32589149a2b776b668510662360e04aa66ade88
Auto-generated-cl: translation import
2014-12-03 11:01:37 -08:00
Sunny Goyal f204877999 Fixing wrong package check when adding shortcuts
Bug: 18571789,18535867
Change-Id: I2544fa634879846d812b00f8649520400f66d29e
2014-12-03 22:32:46 +05:30
Adam Cohen 5c18b80ed9 Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Bug: 18567716

Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
2014-12-02 15:40:19 -08:00
The Android Automerger 5481aab2d6 merge in ub-now-queens-release history after reset to ub-now-queens 2014-12-02 10:20:40 +00:00
Winson Chung 1c96028f41 Merge "Ignoring specific db exception to workaround Bug. 18554839." into ub-now-queens 2014-12-02 00:30:46 +00:00
Winson Chung 5f05913f71 Ignoring specific db exception to workaround Bug. 18554839.
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
2014-12-01 15:06:47 -08:00
Chris Wren b02e611d15 Don't try to create an app state instance during restore.
Added a static utility function to get the DeviceProfile instead.

Bug: 18504164
Change-Id: Ia510a84f1c195e58acf3bf4d1f6a42c739fdd413
2014-11-24 16:57:54 -05:00
Geoff Mendal ab6527da41 Import translations. DO NOT MERGE
Change-Id: I0d7a075387e2ba2c8b9607620ae1d1197cf5cd99
Auto-generated-cl: translation import
2014-11-24 06:21:53 -08:00
The Android Automerger c3f29614ba merge in ub-now-queens-release history after reset to ub-now-queens 2014-11-24 13:28:30 +00:00