Commits · 1115f891dd6fe65078c50ef9c6ac9b1ce415d082 · halo / packages_apps_Launcher3

20 Oct, 2015 40 commits

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 1115f891

Huy Nguyen authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c am: 2feee6de am: ab3847b8 am: 0cce0579 am: 8c9ef49a
am: cbdc9615

* commit 'cbdc9615':

1115f891

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · f616a8e2

Mark Ashdown authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f3348 am: 68c0bedd am: 59329359 am: daf2da93 am: 4cad8c77
am: 1df97e4e

* commit '1df97e4e':

f616a8e2

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · d2688e3c

Mathew Inwood authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7 am: 52cced3e am: 9cd759a5 am: a9d4118a am: 8020ebf7
am: df112558

* commit 'df112558':

d2688e3c

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 8d9f5bae

Juan Silveira authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d40 am: b6973a57 am: a379acb1 am: 28c9e80c am: abe2da3e
am: 67e33739

* commit '67e33739':

8d9f5bae

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · f882fb27

Anton Hansson authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c42 am: 216a53f0 am: aeb301c7 am: 817bbecd am: 14861fae
am: 59fcb9ce

* commit '59fcb9ce':

f882fb27

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · d566d24f

Adam Skory authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b9 am: 61172868 am: 157e6c57 am: d078023b am: 5b55c46e
am: 186a1a70

* commit '186a1a70':

d566d24f

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 1497b879

Adam Skory authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c am: d0726866 am: f351edd6 am: 49bc959e am: 9c3d1aee
am: 319c9ac4

* commit '319c9ac4':

1497b879

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:... · 6dc5663a

Adam Skory authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb am: f8f29b43 am: 92557c95 am: a324418e am: 8194e083
am: f4181580

* commit 'f4181580':

6dc5663a

am : Merge "Fixing typo from previous CL" into ub-now-porkchop am:... · 58de3e8c

Adam Cohen authored 9 years ago

am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51b am: 6d0a9320 am: a5eae84c
am: e4eadaaf

* commit 'e4eadaaf':

58de3e8c

am : Merge "Fix missing screen when adding widget directly to... · cd4afe29

Adam Cohen authored 9 years ago

am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949 am: 313c1de1 am: 20053bc6
am: f9c3e8a6

* commit 'f9c3e8a6':

cd4afe29

am : DO NOT MERGE Rechecking unrestored items when launcher gets... · 11164db1

Sunny Goyal authored 9 years ago

am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88  -s ours am: 852a9656 am: 153ccdf5
am: dea24897  -s ours

* commit 'dea24897':

11164db1

am 0c2918f4: Use View.generateViewId if available am: 3d78b80e am: 8374915b am: ceb823f9 · 0317b768
Ian Parkinson authored 9 years ago
```
am: 35a3ca53

* commit '35a3ca53':
```
0317b768
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10e am: a42854b9 am: 53e87e86 · 254e7b0a
Adam Cohen authored 9 years ago
```
am: 11174f43

* commit '11174f43':
```
254e7b0a

am : Merge "Remove reference to CODENAME from compat code." into... · afc9a931

Kenny Guy authored 9 years ago

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f am: 689cb636 am: e4317037
am: 0fa7200b

* commit '0fa7200b':

afc9a931

am : Merge "Don\'t let old Launcher activity interfere with new one"... · d077b9d1

Adam Cohen authored 9 years ago

am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28 am: 7e88e90a am: b75de587
am: 29a81daa

* commit '29a81daa':

d077b9d1

am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b am: 867cd087 am: 5a7f0e05 · bd92113a
Bjorn Bringert authored 9 years ago
```
am: 326e8880

* commit '326e8880':
```
bd92113a

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · cbdc9615

Huy Nguyen authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c am: 2feee6de am: ab3847b8 am: 0cce0579
am: 8c9ef49a

* commit '8c9ef49a':

cbdc9615

am : Merge "Resetting launcherProvider data if restore set was empty"... · dcb93ff3

Sunny Goyal authored 9 years ago

am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d69 am: 5d36c5b0 am: ab1bfbf9
am: b1250ad8

* commit 'b1250ad8':

dcb93ff3

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 1df97e4e

Mark Ashdown authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f3348 am: 68c0bedd am: 59329359 am: daf2da93
am: 4cad8c77

* commit '4cad8c77':

1df97e4e

am : (-s ours) Merge "Import translations. DO NOT MERGE" into... · 8c0efbe3

Baligh Uddin authored 9 years ago

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588  -s ours am: eb8ce942  -s ours am: 56985a18  -s ours
am: a03da71a  -s ours

* commit 'a03da71a':

8c0efbe3

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · df112558

Mathew Inwood authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7 am: 52cced3e am: 9cd759a5 am: a9d4118a
am: 8020ebf7

* commit '8020ebf7':

df112558

am : Fixing loadWorkspace being called multiple times Using right... · d5f09732

Sunny Goyal authored 9 years ago

am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d64 am: ffe21b31 am: f321db68
am: d090146a

* commit 'd090146a':

d5f09732

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 67e33739

Juan Silveira authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d40 am: b6973a57 am: a379acb1 am: 28c9e80c
am: abe2da3e

* commit 'abe2da3e':

67e33739

am f876301d: UI Fixes am: 50141452 am: 2f22fa89 am: 718278e9 · 9e095af3
Sunny Goyal authored 9 years ago
```
am: 2550c9f4

* commit '2550c9f4':
```
9e095af3

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 59fcb9ce

Anton Hansson authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c42 am: 216a53f0 am: aeb301c7 am: 817bbecd
am: 14861fae

* commit '14861fae':

59fcb9ce

am : Merge "When ensuring screen exists, make sure it\'s actually... · 48431f52

Adam Cohen authored 9 years ago

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a am: 86b4730b am: 278d4d2d
am: 9975db3a

* commit '9975db3a':

48431f52

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 186a1a70

Adam Skory authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b9 am: 61172868 am: 157e6c57 am: d078023b
am: 5b55c46e

* commit '5b55c46e':

186a1a70

am : (-s ours) Merge "Import translations. DO NOT MERGE" into... · 909bccee

Baligh Uddin authored 9 years ago

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a  -s ours am: bfe43479  -s ours am: 669ef65a  -s ours
am: 03937ac5  -s ours

* commit '03937ac5':

909bccee

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 319c9ac4

Adam Skory authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c am: d0726866 am: f351edd6 am: 49bc959e
am: 9c3d1aee

* commit '9c3d1aee':

319c9ac4

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:... · f4181580

Adam Skory authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb am: f8f29b43 am: 92557c95 am: a324418e
am: 8194e083

* commit '8194e083':

f4181580

am : Merge "Fixing typo from previous CL" into ub-now-porkchop am:... · e4eadaaf

Adam Cohen authored 9 years ago

am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51b am: 6d0a9320
am: a5eae84c

* commit 'a5eae84c':

e4eadaaf

am : Merge "Fix missing screen when adding widget directly to... · f9c3e8a6

Adam Cohen authored 9 years ago

am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949 am: 313c1de1
am: 20053bc6

* commit '20053bc6':

f9c3e8a6

am : DO NOT MERGE Rechecking unrestored items when launcher gets... · dea24897

Sunny Goyal authored 9 years ago

am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88  -s ours am: 852a9656
am: 153ccdf5

* commit '153ccdf5':

dea24897

am 0c2918f4: Use View.generateViewId if available am: 3d78b80e am: 8374915b · 35a3ca53
Ian Parkinson authored 9 years ago
```
am: ceb823f9

* commit 'ceb823f9':
```
35a3ca53
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10e am: a42854b9 · 11174f43
Adam Cohen authored 9 years ago
```
am: 53e87e86

* commit '53e87e86':
```
11174f43

am : Merge "Remove reference to CODENAME from compat code." into... · 0fa7200b

Kenny Guy authored 9 years ago

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f am: 689cb636
am: e4317037

* commit 'e4317037':

0fa7200b

am : Merge "Don\'t let old Launcher activity interfere with new one"... · 29a81daa

Adam Cohen authored 9 years ago

am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28 am: 7e88e90a
am: b75de587

* commit 'b75de587':

29a81daa

am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b am: 867cd087 · 326e8880
Bjorn Bringert authored 9 years ago
```
am: 5a7f0e05

* commit '5a7f0e05':
```
326e8880

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release... · 8c9ef49a

Huy Nguyen authored 9 years ago

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c am: 2feee6de am: ab3847b8
am: 0cce0579

* commit '0cce0579':

8c9ef49a

am : Merge "Resetting launcherProvider data if restore set was empty"... · b1250ad8

Sunny Goyal authored 9 years ago

am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d69 am: 5d36c5b0
am: ab1bfbf9

* commit 'ab1bfbf9':

b1250ad8