PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,507 Commits 1 Branch 0 Tags
eedc7ab8fdb94de05201fa87537991558accbe8a
Commit Graph

78507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathew Inwood 7748c94d25 am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: d5da3cc1d8

* commit 'd5da3cc1d8e534f60925514bbc7d1e72b225cd97':
 2015-10-20 00:29:00 +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
Juan Silveira 3f39cc45d8 am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 524ed6adda

* commit '524ed6addab4294f3be29cfbef5ef571077ca3a4':
 2015-10-20 00:28:52 +00:00
Anton Hansson cb168d34ae am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 0274f0a568

* commit '0274f0a568fed5aa57d0c40acfb74bea67cba29a':
 2015-10-20 00:28:46 +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
Adam Skory 5c597e4aba am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 5cc929caa0

* commit '5cc929caa0922e0b80dbf3f6c099d841c3797c20':
 2015-10-20 00:28:39 +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
Baligh Uddin 319e21ec62 keep history after reset to ub-now-lunchbox-release@1069658 
am: 2b8dbe3a5f

* commit '2b8dbe3a5f5f673e87aa4b13133a4d3bf2b98b3c':
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)
 2015-10-20 00:28:33 +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
Huy Nguyen a59ef0ba69 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 8dc2ca68c1

* commit '8dc2ca68c1ccf1570caec3e52c2671b323cf7102':
 2015-10-20 00:28:28 +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
Mark Ashdown b7b834bde1 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: a2bc37722e

* commit 'a2bc37722e9fa0af9d67986038aec58af5308771':
 2015-10-20 00:28:23 +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
Huy Nguyen 2feee6dec2 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 6cb8ae4c16

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

* commit '501414523ef1e3dc394746ea01489a934e826865':
 2015-10-20 00:28:14 +00:00
Mark Ashdown 68c0bedde8 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 7c9f33481f

* commit '7c9f33481fd3c063495813b2772e198ed696e3ce':
 2015-10-20 00:28:10 +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
Mathew Inwood 52cced3ede Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 56ca86b7c1

* commit '56ca86b7c177fd6fb330d6cb3631070e8689cd87':
 2015-10-20 00:28:05 +00:00
Juan Silveira b6973a57c3 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 07130d400c

* commit '07130d400c52518e413e58334525f1598c3b8f1a':
 2015-10-20 00:28:01 +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
Anton Hansson 216a53f0b1 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: d0642c4274

* commit 'd0642c4274abcbede9177d61b0f072689db889a9':
 2015-10-20 00:27:55 +00:00
Adam Skory 61172868fd Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 853b55b96e

* commit '853b55b96e4af7a4f949a22cc084bd333e528c1c':
 2015-10-20 00:27:51 +00:00
Adam Skory d072686669 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 9e3ebf3c95

* commit '9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
 2015-10-20 00:27:43 +00:00
Adam Skory f8f29b43ff Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release 
am: 381fa3fb2d

* commit '381fa3fb2d990f7976a898c16f3675dbb325b848':
 2015-10-20 00:27:39 +00:00
Sunny Goyal b84046dacf Scaling down the icon before applying the user badge 
> This also saves memory only create one new bitmap while loading instead of two

Bug: 25027252
Change-Id: Ia594dd65a30f32e99404190f649b334615c9e17f
 2015-10-19 14:05:25 -07:00
Geoff Mendal 531b25c76b Import translations. DO NOT MERGE am: f58538672a -s ours 
am: 705b4abd57  -s ours

* commit '705b4abd5793f2b989bca9c53220ffff3014a6ec':
  Import translations. DO NOT MERGE
 2015-10-19 16:29:23 +00:00
Geoff Mendal 705b4abd57 Import translations. DO NOT MERGE 
am: f58538672a  -s ours

* commit 'f58538672aaeb1d0d00a9c65a773f5e251003c3b':
  Import translations. DO NOT MERGE
 2015-10-19 16:25:53 +00:00
Geoff Mendal f415b0033a Import translations. DO NOT MERGE 
am: 8c23c2d2ba  -s ours

* commit '8c23c2d2ba4b7067afca5a28df2709450d29c5bf':
  Import translations. DO NOT MERGE
 2015-10-19 16:25:53 +00:00
Geoff Mendal a667bb0aa7 Import translations. DO NOT MERGE 
Change-Id: Iab62cd0b92f647d639aea075133a9168dd7ee462
Auto-generated-cl: translation import
 2015-10-19 08:52:02 -07:00
Geoff Mendal 8c23c2d2ba Import translations. DO NOT MERGE 
Change-Id: If930ef94a3abe3e27123d1fe3553b0a3a453ffec
Auto-generated-cl: translation import
 2015-10-19 08:50:56 -07:00
Geoff Mendal f58538672a Import translations. DO NOT MERGE 
Change-Id: Iee53921c75c785c7d73dd375b4e044761a5a7246
Auto-generated-cl: translation import
 2015-10-19 08:49:51 -07:00
Sunny Goyal 6e0cb633bc Merge "Adding tests for rotation preference Updating the gradle file to run tests directly from AndroidStudio" into ub-launcher3-burnaby-polish 
am: 917d434c5c

* commit '917d434c5ce93ae86b43a3825c9cbc3541843f5e':
  Adding tests for rotation preference Updating the gradle file to run tests directly from AndroidStudio
 2015-10-17 00:51:18 +00:00
Sunny Goyal 917d434c5c Merge "Adding tests for rotation preference Updating the gradle file to run tests directly from AndroidStudio" into ub-launcher3-burnaby-polish 2015-10-17 00:49:33 +00:00
Sunny Goyal 3d1c0ffba7 Adding tests for rotation preference 
Updating the gradle file to run tests directly from AndroidStudio

Change-Id: Iac23dfc6f995477f2406071fbfab3a16ee58ce6f
 2015-10-16 17:19:36 -07:00
Winson 47ecbb85f3 resolve merge conflicts of fb4014daa3 to ub-launcher3-master. 
Change-Id: I6d84a7f3fad757bf139b6ea0001ac6ab88850996
 2015-10-16 16:47:49 -07:00
Winson Chung fb4014daa3 Merge "Fix issue with source params not reporting predicted apps." into ub-launcher3-burnaby-polish 2015-10-16 22:20:14 +00:00
Winson a49b1f75cd Fix issue with source params not reporting predicted apps. 
Bug: 25020080
Change-Id: Iaa67ccbb3e3a6c264aaa4fa3c915faad8a69bbbc
 2015-10-16 14:57:24 -07:00
Tony Wickham 8385e7188d Add LauncherCallbacks method to add additional search widget options. am: 775455c4a8 
am: f79d347a61

* commit 'f79d347a615023d9db721e6483d08033aaabd575':
  Add LauncherCallbacks method to add additional search widget options.
 2015-10-16 20:43:32 +00:00
Tony Wickham f79d347a61 Add LauncherCallbacks method to add additional search widget options. 
am: 775455c4a8

* commit '775455c4a8266655bf43b943e969d42ac32609ec':
  Add LauncherCallbacks method to add additional search widget options.
 2015-10-16 20:40:34 +00:00
Sunny Goyal 041434fb59 Merge "Preventing activity to restart when keyboard is connected or keyboard type changes" into ub-launcher3-burnaby-polish 
am: 363da26646

* commit '363da26646b3214a437981fc3ad908ccd363f8f3':
  Preventing activity to restart when keyboard is connected or keyboard type changes
 2015-10-16 18:37:37 +00:00
Sunny Goyal 363da26646 Merge "Preventing activity to restart when keyboard is connected or keyboard type changes" into ub-launcher3-burnaby-polish 2015-10-16 18:32:43 +00:00
Tony Wickham c2d77a5bb0 am fb062c63: Close some Cursors and call super.onFinishInflate(). 
* commit 'fb062c63355f65e6df9e99cbf4cce49cee2900d1':
  Close some Cursors and call super.onFinishInflate().
 2015-10-16 17:17:46 +00:00
Tony Wickham 775455c4a8 Add LauncherCallbacks method to add additional search widget options. 
Bug: 25000458
Change-Id: I5e8d48617568569bc6e4f284749c3ed9fb20a68f
 2015-10-16 10:15:36 -07:00
Tony Wickham fb062c6335 Close some Cursors and call super.onFinishInflate(). 
Android Studio gave these warnings, and they seem like good ideas.

Change-Id: I9a4d3997fd18e86e007e4511e1ac9e8a75509265
 2015-10-16 10:12:23 -07:00
Sunny Goyal 9eba1fd75e Refactoring WallpaperOffsetInterpolator to a new file 
Removing some us unused methods

Change-Id: Ife790e5ca6848fa13dc3fab1bba1e6220bf83743
 2015-10-16 09:02:25 -07:00
Tony Wickham 9ccb94b6e4 resolved conflicts for a8709ddb to ub-launcher3-master 
Change-Id: I172395e6e172914627b6dec721070a66520557b1
 2015-10-15 11:18:26 -07:00
Tony Wickham a8709ddbbf Merge "Fix "The specified child already has a parent" IllegalStateException." into ub-launcher3-burnaby-polish 2015-10-15 18:00:59 +00:00
Tony Wickham a0628cc521 Fix "The specified child already has a parent" IllegalStateException. 
The problem was due to a race condition between removing a prebound
widget view from the drag layer and adding the same view to the
workspace upon dropping it; if you let go of the widget immediately
after picking it up, the latter happened before the former.

Specifically, the flow was: long-click a widget --> drop --> remove
the view from the drag layer if it's not null (it is, so nothing
happens) --> the view is finally bound/inflated and added to the drag
layer --> add the view to the workspace --> already has a parent.

There are actually 2 problems here: one is that the bind/inflate is
asynchronous, and can therefore happen after dropping the widget view
being inflated, and the other is that the view is added to the
workspace even though the transition has barely started (we usually
ignore drops if the transition is less than half complete). It turns
out that this second problem was also due to a race condition, this
time between dropping a widget or app onto the workspace and calling
LauncherStateTransitionAnimation.dispatchOnLauncherTransitionStart().
If the drop happened before the dispatch, as in the case of the
crash, then the drop was accepted because the transition progress was
still 1.0 from the previous transition.

I fixed the first problem by removing the drag layer widget view
in Launcher where it is potentially used instead of Workspace. And I
fixed the second problem by setting mTransitionProgress to 0 in
Workspace.onLauncherTransitionPrepare().

I also added some debugging logs.

Bug: 23896857
Change-Id: I66944e6d3f23b70dea15f7fb01af0763a1bfcbda
 2015-10-15 10:07:06 -07:00
Winson Chung 264c67da93 am bffce8ce: resolved conflicts for cf426036 to stage-aosp-master 
* commit 'bffce8ce7a4a4c8625d5443093e2c1caaabaf975':
  Showing a permission prompt for direct call shortcuts
 2015-10-14 23:41:43 +00:00