OSDN Git Service
Adam Skory [Tue, 20 Oct 2015 01:48:55 +0000 (01:48 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e am:
61172868fd am:
157e6c57d6 am:
d078023bce am:
5b55c46e01
am:
186a1a7060
* commit '
186a1a7060308a383cd123fbdcd763d49587d99c':
Adam Skory [Tue, 20 Oct 2015 01:48:50 +0000 (01:48 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95 am:
d072686669 am:
f351edd651 am:
49bc959e07 am:
9c3d1aee2f
am:
319c9ac41f
* commit '
319c9ac41fb545e6ca7f81b6d1d8fe22b9554e15':
Adam Skory [Tue, 20 Oct 2015 01:48:43 +0000 (01:48 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d am:
f8f29b43ff am:
92557c9596 am:
a324418ece am:
8194e08397
am:
f41815802e
* commit '
f41815802ef91385c7c4c345e687956fa3e6f3c1':
Adam Cohen [Tue, 20 Oct 2015 01:31:21 +0000 (01:31 +0000)]
am
ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am:
e7afa51bd8 am:
6d0a93207e am:
a5eae84cbf
am:
e4eadaaf37
* commit '
e4eadaaf3744e12221b459524c457046af678588':
Adam Cohen [Tue, 20 Oct 2015 01:31:18 +0000 (01:31 +0000)]
am
755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am:
84a79949a4 am:
313c1de1cc am:
20053bc691
am:
f9c3e8a6ae
* commit '
f9c3e8a6ae82235c03c6d8095d7e33c15cd9213b':
Sunny Goyal [Tue, 20 Oct 2015 01:31:15 +0000 (01:31 +0000)]
am
8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am:
fdbfba88d4 -s ours am:
852a96562a am:
153ccdf5ee
am:
dea24897a3 -s ours
* commit '
dea24897a3bd2913e76bed63be398d1ad4514d62':
Ian Parkinson [Tue, 20 Oct 2015 01:31:11 +0000 (01:31 +0000)]
Adam Cohen [Tue, 20 Oct 2015 01:31:08 +0000 (01:31 +0000)]
Kenny Guy [Tue, 20 Oct 2015 01:31:05 +0000 (01:31 +0000)]
am
0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am:
5f2a520f0c am:
689cb6366b am:
e431703711
am:
0fa7200b5a
* commit '
0fa7200b5ac94f4ed45a1849ff26da3a5a65cb53':
Adam Cohen [Tue, 20 Oct 2015 01:31:01 +0000 (01:31 +0000)]
am
52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am:
91c11b28d5 am:
7e88e90afc am:
b75de587c5
am:
29a81daa0d
* commit '
29a81daa0d2faecca8fbaa36e04d85ac94242088':
Bjorn Bringert [Tue, 20 Oct 2015 01:30:57 +0000 (01:30 +0000)]
Sunny Goyal [Tue, 20 Oct 2015 01:30:53 +0000 (01:30 +0000)]
am
6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am:
e7599d6943 am:
5d36c5b03b am:
ab1bfbf928
am:
b1250ad81d
* commit '
b1250ad81d3dc08933c3c3b63d5f215ddfe0c072':
Baligh Uddin [Tue, 20 Oct 2015 01:30:49 +0000 (01:30 +0000)]
am
10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
ab474588ce -s ours am:
eb8ce94244 -s ours am:
56985a1867 -s ours
am:
a03da71ae3 -s ours
* commit '
a03da71ae30ee04f2bcdb3edf1b7e362c54f2d45':
Sunny Goyal [Tue, 20 Oct 2015 01:30:44 +0000 (01:30 +0000)]
am
c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am:
e43f0d646c am:
ffe21b3129 am:
f321db6800
am:
d090146ad8
* commit '
d090146ad86f0cecf3c76abd8b2deeae37582aa1':
Sunny Goyal [Tue, 20 Oct 2015 01:30:39 +0000 (01:30 +0000)]
Adam Cohen [Tue, 20 Oct 2015 01:30:35 +0000 (01:30 +0000)]
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 am:
278d4d2d5a
am:
9975db3a5e
* commit '
9975db3a5ee777a0752a8b94cc4d666bc1f9bbfc':
Adam Skory [Tue, 20 Oct 2015 01:30:33 +0000 (01:30 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e am:
61172868fd am:
157e6c57d6 am:
d078023bce
am:
5b55c46e01
* commit '
5b55c46e015bd9bfe2fd72ae090add4eb189adb3':
Baligh Uddin [Tue, 20 Oct 2015 01:30:31 +0000 (01:30 +0000)]
am
68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
6317598a19 -s ours am:
bfe4347964 -s ours am:
669ef65afb -s ours
am:
03937ac5d7 -s ours
* commit '
03937ac5d7c2dae4d730bc6cea6d42c63ad13181':
Adam Skory [Tue, 20 Oct 2015 01:30:29 +0000 (01:30 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95 am:
d072686669 am:
f351edd651 am:
49bc959e07
am:
9c3d1aee2f
* commit '
9c3d1aee2f0a74b30a44bb5b64e37e399db0c1cc':
Adam Skory [Tue, 20 Oct 2015 01:30:23 +0000 (01:30 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d am:
f8f29b43ff am:
92557c9596 am:
a324418ece
am:
8194e08397
* commit '
8194e0839760fd5e8eb785c0945b046dff5c7a7c':
Adam Cohen [Tue, 20 Oct 2015 01:13:14 +0000 (01:13 +0000)]
am
ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am:
e7afa51bd8 am:
6d0a93207e
am:
a5eae84cbf
* commit '
a5eae84cbf218dc932dfaebcacceefe55fed18b8':
Adam Cohen [Tue, 20 Oct 2015 01:13:11 +0000 (01:13 +0000)]
am
755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am:
84a79949a4 am:
313c1de1cc
am:
20053bc691
* commit '
20053bc691fad846d7220d9aaa0ea62c9e864840':
Sunny Goyal [Tue, 20 Oct 2015 01:13:08 +0000 (01:13 +0000)]
am
8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am:
fdbfba88d4 -s ours am:
852a96562a
am:
153ccdf5ee
* commit '
153ccdf5ee6d9d97eb36597d5bed79e5d6a0c71a':
Ian Parkinson [Tue, 20 Oct 2015 01:13:02 +0000 (01:13 +0000)]
Adam Cohen [Tue, 20 Oct 2015 01:12:58 +0000 (01:12 +0000)]
Kenny Guy [Tue, 20 Oct 2015 01:12:52 +0000 (01:12 +0000)]
am
0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am:
5f2a520f0c am:
689cb6366b
am:
e431703711
* commit '
e431703711bf883b139f41fdd21ecf3c34b79ea8':
Adam Cohen [Tue, 20 Oct 2015 01:12:48 +0000 (01:12 +0000)]
am
52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am:
91c11b28d5 am:
7e88e90afc
am:
b75de587c5
* commit '
b75de587c52ee4f9ba5ada289c0675f1fafdc7f9':
Bjorn Bringert [Tue, 20 Oct 2015 01:12:44 +0000 (01:12 +0000)]
Sunny Goyal [Tue, 20 Oct 2015 01:12:40 +0000 (01:12 +0000)]
am
6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am:
e7599d6943 am:
5d36c5b03b
am:
ab1bfbf928
* commit '
ab1bfbf9285e6d917c94ec1b4c57c66d57cb6c23':
Baligh Uddin [Tue, 20 Oct 2015 01:12:33 +0000 (01:12 +0000)]
am
10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
ab474588ce -s ours am:
eb8ce94244 -s ours
am:
56985a1867 -s ours
* commit '
56985a1867525557fd15a1b74fc768945ebc56c6':
Sunny Goyal [Tue, 20 Oct 2015 01:12:27 +0000 (01:12 +0000)]
am
c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am:
e43f0d646c am:
ffe21b3129
am:
f321db6800
* commit '
f321db6800bbfc1e95f82ca6f01002f7d3e5bf2d':
Sunny Goyal [Tue, 20 Oct 2015 01:12:23 +0000 (01:12 +0000)]
Adam Cohen [Tue, 20 Oct 2015 01:12:17 +0000 (01:12 +0000)]
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
am:
278d4d2d5a
* commit '
278d4d2d5af5abff45633301976e861196bd90ac':
Adam Skory [Tue, 20 Oct 2015 01:12:14 +0000 (01:12 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e am:
61172868fd am:
157e6c57d6
am:
d078023bce
* commit '
d078023bcee35457d2bbd804c58b89ee7eec9d17':
Baligh Uddin [Tue, 20 Oct 2015 01:12:12 +0000 (01:12 +0000)]
am
68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
6317598a19 -s ours am:
bfe4347964 -s ours
am:
669ef65afb -s ours
* commit '
669ef65afbb3799333b4e961371b920653ec870f':
Adam Skory [Tue, 20 Oct 2015 01:12:08 +0000 (01:12 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95 am:
d072686669 am:
f351edd651
am:
49bc959e07
* commit '
49bc959e074295009b5024d43519f8ba3e20d0bb':
Adam Skory [Tue, 20 Oct 2015 01:12:02 +0000 (01:12 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d am:
f8f29b43ff am:
92557c9596
am:
a324418ece
* commit '
a324418ecef0fff08695f29b6bf191049bf79598':
Adam Cohen [Tue, 20 Oct 2015 00:54:55 +0000 (00:54 +0000)]
am
ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am:
e7afa51bd8
am:
6d0a93207e
* commit '
6d0a93207ebb2ed8380e398ca3ecc5965975c778':
Adam Cohen [Tue, 20 Oct 2015 00:54:51 +0000 (00:54 +0000)]
am
755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am:
84a79949a4
am:
313c1de1cc
* commit '
313c1de1cc69d9d4b59fd2b2f88fdba26bc8d4de':
Sunny Goyal [Tue, 20 Oct 2015 00:54:48 +0000 (00:54 +0000)]
am
8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am:
fdbfba88d4 -s ours
am:
852a96562a
* commit '
852a96562af274cb6768f7370436d632fcf7ed05':
Ian Parkinson [Tue, 20 Oct 2015 00:54:44 +0000 (00:54 +0000)]
Adam Cohen [Tue, 20 Oct 2015 00:54:41 +0000 (00:54 +0000)]
Kenny Guy [Tue, 20 Oct 2015 00:54:37 +0000 (00:54 +0000)]
am
0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am:
5f2a520f0c
am:
689cb6366b
* commit '
689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3':
Adam Cohen [Tue, 20 Oct 2015 00:54:31 +0000 (00:54 +0000)]
am
52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am:
91c11b28d5
am:
7e88e90afc
* commit '
7e88e90afc2fce3e64735ee0f11b9098193253d3':
Bjorn Bringert [Tue, 20 Oct 2015 00:54:27 +0000 (00:54 +0000)]
Sunny Goyal [Tue, 20 Oct 2015 00:54:23 +0000 (00:54 +0000)]
am
6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am:
e7599d6943
am:
5d36c5b03b
* commit '
5d36c5b03bbbd2906a74e4c9c17faa74f5d4c4ec':
Baligh Uddin [Tue, 20 Oct 2015 00:54:18 +0000 (00:54 +0000)]
am
10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
ab474588ce -s ours
am:
eb8ce94244 -s ours
* commit '
eb8ce94244706fd12d41740ad949469a10c5ab43':
Sunny Goyal [Tue, 20 Oct 2015 00:54:14 +0000 (00:54 +0000)]
am
c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am:
e43f0d646c
am:
ffe21b3129
* commit '
ffe21b31295b2195b219372394096253dda64e89':
Sunny Goyal [Tue, 20 Oct 2015 00:54:08 +0000 (00:54 +0000)]
Adam Cohen [Tue, 20 Oct 2015 00:54:03 +0000 (00:54 +0000)]
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':
Baligh Uddin [Tue, 20 Oct 2015 00:53:58 +0000 (00:53 +0000)]
am
68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
6317598a19 -s ours
am:
bfe4347964 -s ours
* commit '
bfe43479643fece25c8aeabb64b90ca9d6c028be':
Adam Skory [Tue, 20 Oct 2015 00:53:54 +0000 (00:53 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e am:
61172868fd
am:
157e6c57d6
* commit '
157e6c57d6b9093e2d491b979b4744fe35052242':
Adam Skory [Tue, 20 Oct 2015 00:53:49 +0000 (00:53 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95 am:
d072686669
am:
f351edd651
* commit '
f351edd6519615d60cb646a6976bc69caa5e7dc2':
Adam Skory [Tue, 20 Oct 2015 00:53:44 +0000 (00:53 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d am:
f8f29b43ff
am:
92557c9596
* commit '
92557c9596e2568336fe5f6d4bb36d579205feb2':
Adam Skory [Tue, 20 Oct 2015 00:33:21 +0000 (00:33 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e
am:
61172868fd
* commit '
61172868fde38da7f7ec8dcb84288d51095948e1':
Adam Skory [Tue, 20 Oct 2015 00:33:17 +0000 (00:33 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95
am:
d072686669
* commit '
d0726866694356f674ee80ca83ad97ff930bce20':
Adam Skory [Tue, 20 Oct 2015 00:33:10 +0000 (00:33 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d
am:
f8f29b43ff
* commit '
f8f29b43ff7ecf9346e12e965ee90480617525bf':
Adam Cohen [Tue, 20 Oct 2015 00:29:19 +0000 (00:29 +0000)]
am
ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
am:
e7afa51bd8
* commit '
e7afa51bd8f0f0b9f21bd63a9ceeb9f330259fc2':
Adam Cohen [Tue, 20 Oct 2015 00:29:15 +0000 (00:29 +0000)]
am
755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
am:
84a79949a4
* commit '
84a79949a478f8b91c7fcc9346525f7dd187f548':
Sunny Goyal [Tue, 20 Oct 2015 00:29:10 +0000 (00:29 +0000)]
am
8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
am:
fdbfba88d4 -s ours
* commit '
fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':
Ian Parkinson [Tue, 20 Oct 2015 00:29:04 +0000 (00:29 +0000)]
am
0c2918f4: Use View.generateViewId if available
am:
3d78b80ecd
* commit '
3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
Adam Cohen [Tue, 20 Oct 2015 00:28:59 +0000 (00:28 +0000)]
Kenny Guy [Tue, 20 Oct 2015 00:28:53 +0000 (00:28 +0000)]
am
0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
am:
5f2a520f0c
* commit '
5f2a520f0cd47b274bdf809d7b665c956c2717ed':
Adam Cohen [Tue, 20 Oct 2015 00:28:44 +0000 (00:28 +0000)]
am
52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
am:
91c11b28d5
* commit '
91c11b28d57c026d507488c58feedebf7fee6f31':
Bjorn Bringert [Tue, 20 Oct 2015 00:28:36 +0000 (00:28 +0000)]
am
2ed99e86: Build Launcher3 against prebuilt SDK 21
am:
c656245b9c
* commit '
c656245b9cbc370537afb18e7fb38ea87c233fd1':
Sunny Goyal [Tue, 20 Oct 2015 00:28:30 +0000 (00:28 +0000)]
am
6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
am:
e7599d6943
* commit '
e7599d694313845a41221dfa0d7f6dca3aedd02c':
Baligh Uddin [Tue, 20 Oct 2015 00:28:25 +0000 (00:28 +0000)]
am
10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am:
ab474588ce -s ours
* commit '
ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
Sunny Goyal [Tue, 20 Oct 2015 00:28:19 +0000 (00:28 +0000)]
am
c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
am:
e43f0d646c
* commit '
e43f0d646c60c6f59333224686725717cdf2ccbc':
Sunny Goyal [Tue, 20 Oct 2015 00:28:14 +0000 (00:28 +0000)]
Adam Cohen [Tue, 20 Oct 2015 00:28:06 +0000 (00:28 +0000)]
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':
Baligh Uddin [Tue, 20 Oct 2015 00:28:00 +0000 (00:28 +0000)]
am
68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am:
6317598a19 -s ours
* commit '
6317598a196ada3f32950c7f4a8d5cfe005acf42':
Adam Skory [Tue, 20 Oct 2015 00:27:51 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
853b55b96e
* commit '
853b55b96e4af7a4f949a22cc084bd333e528c1c':
Adam Skory [Tue, 20 Oct 2015 00:27:43 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
9e3ebf3c95
* commit '
9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
Adam Skory [Tue, 20 Oct 2015 00:27:39 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
am:
381fa3fb2d
* commit '
381fa3fb2d990f7976a898c16f3675dbb325b848':
Sunny Goyal [Thu, 10 Sep 2015 23:34:09 +0000 (16:34 -0700)]
Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
Conflicts:
Android.mk
Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e
Sunny Goyal [Wed, 9 Sep 2015 17:05:11 +0000 (17:05 +0000)]
Merge "Removing items which are on invalid screen" into ub-launcher3-burnaby
Sunny Goyal [Tue, 8 Sep 2015 21:01:03 +0000 (14:01 -0700)]
Restoring provider behavior for reloading app on old devices
> For older devices, launcher will only reload in case of inserts with specific query parameters
> For older devices, launcehr will notify content observers of any internal inserts
> Chaning TAG for Launcher provider as max logging tag is only 23 characters
Bug:
23821706
Change-Id: I32891387612d967c41ddae848c43dc4b1de1b0e9
Sunny Goyal [Fri, 4 Sep 2015 19:53:04 +0000 (12:53 -0700)]
Removing items which are on invalid screen
Bug:
23804751
Change-Id: If26a6b201aa6127cfd2a08fc4b408a27d6329bad
Sunny Goyal [Thu, 3 Sep 2015 17:12:36 +0000 (17:12 +0000)]
Merge "Preventing null pointer crash when opening a folder" into ub-launcher3-burnaby
Sunny Goyal [Thu, 3 Sep 2015 16:48:50 +0000 (09:48 -0700)]
Preventing null pointer crash when opening a folder
Bug:
23770713
Change-Id: I3ce82450358f1493f70639d594e1e3f391945437
Ivan Lee [Thu, 3 Sep 2015 16:16:07 +0000 (10:16 -0600)]
Revert workaround for move to default screen on home intent.
BUG=
23556755
Change-Id: Ia268a58389b90fd0503e474f02f33a312c051c0e
Sunny Goyal [Tue, 1 Sep 2015 00:15:53 +0000 (00:15 +0000)]
Merge "Adding gradle script for Android Studio" into ub-launcher3-burnaby
Winson Chung [Mon, 31 Aug 2015 22:08:41 +0000 (22:08 +0000)]
Merge "Fixing NPE in recycler view scroll bar." into ub-launcher3-burnaby
Winson [Mon, 31 Aug 2015 22:02:26 +0000 (15:02 -0700)]
Fixing NPE in recycler view scroll bar.
- The regression was introduced in scroll bar changes ag/751628, but
unlike AllApps, the WidgetsRecyclerView can have an unbound model.
Bug:
23689784
Change-Id: Ibd3d5bcbafab0ada9a372fa00acaa45809ce720d
Winson Chung [Mon, 31 Aug 2015 18:40:41 +0000 (18:40 +0000)]
Merge "Adding workaround for regression caused by ag/752175" into ub-launcher3-burnaby
Winson [Mon, 31 Aug 2015 18:32:38 +0000 (11:32 -0700)]
Adding workaround for regression caused by ag/752175
Change-Id: I92617c88f17a5827454e147f93d822975587d5b4
Sunny Goyal [Sun, 30 Aug 2015 06:16:27 +0000 (23:16 -0700)]
Adding gradle script for Android Studio
Change-Id: I640c63e2981337eb8c8ed191b40c0649a986361e
Winson Chung [Fri, 28 Aug 2015 21:17:36 +0000 (21:17 +0000)]
Merge "Override the overscroll color for the widget rows." into ub-launcher3-burnaby
Sunny Goyal [Fri, 28 Aug 2015 21:16:03 +0000 (21:16 +0000)]
Merge "Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app" into ub-launcher3-burnaby
Winson Chung [Fri, 28 Aug 2015 21:08:49 +0000 (21:08 +0000)]
Merge "Adding graphic for all apps empty search screen." into ub-launcher3-burnaby
Winson [Fri, 28 Aug 2015 21:05:07 +0000 (14:05 -0700)]
Override the overscroll color for the widget rows.
Change-Id: I249e13f511736ad9e874800a1b9ee1f8602434f4
Winson [Thu, 20 Aug 2015 00:26:21 +0000 (17:26 -0700)]
Adding graphic for all apps empty search screen.
Change-Id: I976a327a5984790c458b0f36d33c0b1ac16ec59c
Sunny Goyal [Fri, 28 Aug 2015 17:26:48 +0000 (10:26 -0700)]
Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app
Bug:
23515512
Change-Id: I60678eccd4b60225ff30960f7197d633f72c7659
Sunny Goyal [Thu, 27 Aug 2015 22:30:25 +0000 (15:30 -0700)]
Revert "Adding viewId for the QSB"
Using QSB widget id from xml
This reverts commit
995685913955f33b05fdc0b473df901f2b0652c0.
Change-Id: I33c48cf074f2dc1cf509c2d9f1f19b40b91f6a22
Sunny Goyal [Thu, 27 Aug 2015 21:12:55 +0000 (21:12 +0000)]
Merge "Adding viewId for the QSB" into ub-launcher3-burnaby
Sunny Goyal [Thu, 27 Aug 2015 20:48:11 +0000 (13:48 -0700)]
Adding viewId for the QSB
Change-Id: I4ad6bc8c0d94e60a4d354dfc29f456ca561fc500
Winson Chung [Thu, 27 Aug 2015 20:37:33 +0000 (20:37 +0000)]
Merge "Fixing an issue where you would inadvertently start fastscrolling." into ub-launcher3-burnaby
Winson Chung [Thu, 27 Aug 2015 19:36:07 +0000 (19:36 +0000)]
Merge "Fixing issue with missing scroll bar after fast-scrolling and searching." into ub-launcher3-burnaby
Winson [Thu, 27 Aug 2015 19:30:08 +0000 (12:30 -0700)]
Fixing issue with missing scroll bar after fast-scrolling and searching.
- This was due to us not re-attaching the thumb to the scrollbar after
we scroll the view to the top explicitly without the user scrolling.
Bug:
23562489
Change-Id: I5932b9b3b9358e23c0ec23aa235644b4f27c43ea
Winson [Thu, 27 Aug 2015 17:19:48 +0000 (10:19 -0700)]
Fixing an issue where you would inadvertently start fastscrolling.
- This would happen when you scroll near the thumb and pass through the
area where the scrollbar was when the gesture started, and this CL
prevents gestures that move beyond a fixed distance from the original
touch position that is not already a fastscroll.
Bug:
23561678
Change-Id: I66226777671456a8919503dae4e92164ee10dd6d
OSDN Git Service
