The fade in option ignores all user settings if
the device is in landscape or is a tablet. Clean up
the settings loading logic and ensure that the user
settings are respected always.

Repro Steps:
- Force Rotation
- kill trebuchet
- scroll to new screen

Change-Id: I9bc49d1abebd88ac8c95ef44ea4e874494e29e1e
(cherry picked from commit 8de4b987)

Only the dynamic grid reload should be
stopping the launcher with intent to rebuild
the entire workspace.

This returns stopLoader to it's functionality
pre-dynamic grid resize patch.

Change-Id: I55861da83f9b640fd767031e0f2188c5b9b91e66
(cherry picked from commit 7d006588)
(cherry picked from commit 36fcac12)

Change-Id: Ifebad499b03887a4f5e40502c994e5b0e80506f0

Repro:
 - Create a shortcut using the contacts widget
 - Add to a folder and open app protection screen
 - Observe: Trebuchet force closes

Change-Id: I76f6a8b1d024beb36fa804bb3a866913edc335c1
(cherry picked from commit d8bdb0ee)
(cherry picked from commit 42427c9b)

If the dynamic grid is made smaller, currently icons will simply be
hidden from view. Instead, create extra screens and squeeze the icons in
so that they will all be visible upon resize.

In some cases, icons can end up creating screens when it's not necessary
we should revisit this at a later time and look into making these icons
show up in a more expected place.

Change-Id: I9a46f1ac45c1a04e252ed8943afcfe952df1392d
(cherry picked from commit e25ab7bd)

Conflicts:
	src/com/android/launcher3/Folder.java

Change-Id: I7dc0123300ff2e9aa64713c1091d13ecc93001f3

Reproduce
1)In workspace make a folder, click the folder check the hint text of
the rename edittext.
2)Change the system language, then click the folder for rename, in the
second time click the folder the hint text will change to the last
language.

Change-Id: I97d14a15bfa748be900bef193950b85b890efe40
(cherry picked from commit 13d6bcf0)
(cherry picked from commit 347c6ec1)

E/AndroidRuntime(  693): FATAL EXCEPTION: main
E/AndroidRuntime(  693): java.lang.NullPointerException: Attempt to invoke
                         virtual method 'int android.view.View.getMeasuredWidth()'
                         on a null object reference
E/AndroidRuntime(  693):    at com.android.launcher3.PagedView.onTouchEvent
                            (PagedView.java:1986)

Change-Id: Ica9395a1e2b2d28a1b074b40ff759eab68154ff0
(cherry picked from commit 16416d46)

As of now, when the Trebuchet is started for the first time, the set default 
homepage button is not activated on any of the screens.
Activating it for the first time on default home screen makes more sense.

Change-Id: Ia1b7272e177707616902d20ce90ff6ba293576b4
Signed-off-by: Umair Khan <omerjerk@gmail.com>
(cherry picked from commit d15317d1)

Change-Id: I2156c97b8479a0f7f1db9d261f9798a66f650e02
(cherry picked from commit d24a8a9b)

Add resource config override to display the preview of preloaded resource wallpapers
from the left edge to match how they display when set as the wallpaper.

Change-Id: I4aef9e1818ec6942c9b41055b5573308db58a1be

When getStateChangeAnimation() is called, only reload settings if
leaving overview mode.

Change-Id: I9ee7330779b19bb73c1a30497065854ce9fc1162
(cherry picked from commit 8df1f021)

Change-Id: Ie5b5398d17e6742f28084ce7cd6d31c4ba872b24
(cherry picked from commit b53f60bc)
(cherry picked from commit f7eb72cd)

Change-Id: Ief240c7fbbe296673ff4124cd4d463c9ba65f764
(cherry picked from commit 18980a74)
(cherry picked from commit 6404ffc5)

When there's a folder of shortcuts where all of the items have been set
to protected, the first item in the folder sometimes does not get
removed from the workspace allowing access to the protected application.

When the second-to-last item in a folder is being removed, it was being
replaced with the shortcut automatically, and we were checking against
the folder contents, which was off the workspace at this time, but still
had the shortcut. We need to check whether the last shortcut we are
re-adding back to the workspace is actually protected before adding it.

Change-Id: I9c7dbbd8562ae3e71e198747e6cb1c10417d1f46
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit d0629125)

1.Add a Settings shortcut widget to workspace
2.Change the system language
3.Check the Settings shortcut widget title

The Settings shortcut widget title should update when changing the language

Change-Id: I5012a3e99b9734230a844ce20e856ff86fba773a
(cherry picked from commit c4326d48)

Make sure to setWaitingForResult on startIntentSenderForResult so that
mPendingAddInfo is saved

Repro: Change orientation when in the config activity for a widget

Change-Id: I76ecc2b69b7f4a1cda65a481699aa79ae67f767a
(cherry picked from commit ee224cb0)
(cherry picked from commit 9f86f89d)

Change-Id: If7f60147431c183f1696e1069d845a48899f55d9

Change-Id: Ieed7333d3acac4c2e3e130e242f50bb0ada05751

Change-Id: I878deec6ddf8b1c668bf790c8934b0f7f9167dbf

Change-Id: I57cce8130d792d23764aa67d6e20985a71572f2a

When arrays of apps that make up the customized first and second pages
of the app drawer are loaded, all a new syntax to specify the package
name and class name for the Launcher Activity to be included:

"<package name>/<fully qualified Activity class name>"

Maintain backwards compatibility so that if only the Activity class name
is specified, that will be matched as before.

Change-Id: I8fb1464b448dc9addbda74558b3e323b008c8e90
(cherry picked from commit 85d5cc4b)

The custom sorting logic for CTAPP mode removes duplicate apps from
mApps. This must complete before the call to filter mApps into
mFilteredApps.

Change-Id: I915b976bf77ed8714c3bdc7dfe0155feb97bf2b7
(cherry picked from commit a0db9234)

This reverts commit 426998ba.

Change-Id: I98c8c3063301f091389b37ca170c26c9484315a2

If a user enters the widget add screen and quickly backs up
twice, the widget panel stays around and captures touch, but
the ui thinks it is in the homescreen.

Change-Id: I52a920fd633f3ab690ca1c959fbc8935c2d0bb69
(cherry picked from commit e423f8ab)

Conflicts:
	WallpaperPicker/res/values-nodpi/wallpapers.xml
	res/layout/settings_pane.xml
	res/values-zh-rCN/cm_strings.xml
	res/values/preferences_defaults.xml
	src/com/android/launcher3/DynamicGrid.java

Change-Id: I22eb2e38e8802985e0e0a8cb3e68d73189c2c1a4

Change-Id: I9b96a42cc3234f385f09469fdbf7b7c14bf19e39
Signed-off-by: linuxx <joey@cyanogenmoditalia.it>

Change-Id: Id1d2b152dde3d1e3d89fca2e9e16bc2472f661bc

- Also fix row length so icons aren't cut off when large icons are enabled

Change-Id: Iae95dc2380abee211eeed72eae08cafa4ec354f7

Change-Id: I67d0af84cc8cad3d3e788280e34a9c2a95ab76a7

drawer while the vertical app drawer is selected

Change-Id: I352bfd42f60d46c53ee74c4ecf6a6bb3f0b7ba90

Repro:
 - Open widgets
 - Try to add a widget with setup setp (cLock)
 - When setup activity is launched, press Home to cancel
 - Observe: legacy app dawer is visible on top of Workspace
 without a background

Change-Id: I5e7d7d2166cc1cac193407ac9ec16643f52591ba

Change-Id: Ib3976e0852aab4a2e78a90877c056ad3ecd3c448

Change-Id: I4a78832188e27ae0b5a25b6a81ce000b6ffcd1f1

Also fixes searchbar visibility when dragging icons from app drawer

Change-Id: I418dc3210a95cc57c81979452def8240c27d2214

Change-Id: Ia1bcaec9cf5bdcd9ca61137aa45f91819fb2e94d

commit 535c5e89c7484ae96f83af021487a8061f3e0b04
Author: Adnan <adnan@cyngn.com>
Date:   Tue Jul 22 17:21:09 2014 -0700

    Trebuchet: Implement new app drawer.

    Change-Id: Ibf6152352520ece4dff201b8013378a1ad562894

commit d46c52032ef20d9f97409114e6efc34650245fb6
Author: Raj Yengisetty <rajesh@cyngn.com>
Date:   Fri Jul 25 09:13:38 2014 -0700

    Fix: With the new App Drawer implementation AppsDrawerListAdapter should
    clone it's AppInfo ArrayList before removing elements from it, otherwise
    the AppsCustomizePagedView will not add any apps to it's instance
    variables and will never dispaly widgets.

    Repro:
     Long press on workspace to get to overview mode
     Click widgets button
     Observe no Widgets (empty page)

    Change-Id: I7574ae23dbf3298674585060d5da5e00a5852d46

commit b0c7e4fad041e492816a36e538a505983d996a75
Author: Adnan <adnan@cyngn.com>
Date:   Tue Jul 22 19:06:15 2014 -0700

    Catapult: Allow elements to be draggable out of drawer.

    Change-Id: I711b42bad0fc6ae14399f3eb88ec60cd443f87d1

commit 00148d42288a7ee37e8aa05cccb121e9bcf6fbda
Author: Danesh M <danesh@cyngn.com>
Date:   Wed Jul 23 10:37:19 2014 -0700

    Catapult : Make flowlayout wrap_content

    Change-Id: I9db6d39274b71ee2750058fd65f4917701394ac0

commit 268e707d14be0c29448b9f5aee4f26a3180c75fd
Author: Adnan <adnan@cyngn.com>
Date:   Wed Jul 23 13:27:06 2014 -0700

    Catapult: Use recyclerview for side app drawer.

    Change-Id: Ie6f916792375f82a8f97a0369b98b813416216e8

commit efcbdc635e34511b73939639cbcf910728b1b3b2
Author: Adnan <adnan@cyngn.com>
Date:   Wed Jul 23 14:30:37 2014 -0700

    Catapult: Handle app install and uninstall in drawer.

    Change-Id: Ia22876574e96b9ff0d4b4d93a853d7e92633376c

commit 3fb7c6cb0b4bb9cfaf1d11c787df14c6767a72a9
Author: Danesh M <danesh@cyngn.com>
Date:   Thu Jul 24 10:19:57 2014 -0700

    Catapult : Improve scroll performance

    Change-Id: I294beb9c9e1946724108bad2c0bca8839c5bf56b

commit 85828036bd4af0a242f408ba18236b11920a0120
Author: Adnan <adnan@cyngn.com>
Date:   Thu Jul 24 10:46:58 2014 -0700

    Catapult: Use setHasFixedSize on RecyclerView.

    Change-Id: Id06faa37d69f2d3ef533f829d991971ea2a32012

commit 4206cc348bb8aa788b0e4a0f2080deeb55a73d38
Author: Adnan <adnan@cyngn.com>
Date:   Thu Jul 24 10:49:15 2014 -0700

    Catapult: Show App Info and Uninstall options on drag.

    Change-Id: Ica307eef4d2a086733f84704d129ac893f9bbb34

commit 283db64b47a5ec395e7ec07d5e34660c98cef91d
Author: Adnan <adnan@cyngn.com>
Date:   Thu Jul 24 15:00:37 2014 -0700

    Catapult: Properly handle install, remove, and update.

    Change-Id: I16138503bb5d31e999f293afc00e1adc2d574727

commit ca19c304fac9de8b97c0345b0c9a7cf3c3bdf155
Author: Adnan <adnan@cyngn.com>
Date:   Thu Jul 24 15:27:09 2014 -0700

    Catapult: Ignore index 0 when added.

    Change-Id: Id00a41feb1813c419fda4425327024292d51e300

commit f595d415d3b8d9775d7448f1bbc4b542ea40c7a3
Author: Adnan <adnan@cyngn.com>
Date:   Thu Jul 24 15:51:32 2014 -0700

    Catapult: Clean up after drag.

    Change-Id: I858c9aa5e30bc6ca13d4ca53397b769bb6b2b86b

commit c337a69e43f213cacc0fe50a0d001f4cb3a5d9f4
Author: Adnan <adnan@cyngn.com>
Date:   Fri Jul 25 12:46:39 2014 -0700

    Catapult: Fix app updates for new data structure.

      - Also fix line wrapping in class.

    Change-Id: I3c4f33d6e3e236952ea6d73f8402f32ac059f810

commit ef6b88c44f2c6c3372136773fa01821c4fc7ba62
Author: Danesh M <danesh@cyngn.com>
Date:   Thu Jul 24 23:26:41 2014 -0700

    Catapult : Add scrubber

    Change-Id: Ied2e44e2d393bc5537f77c29a4b099da1e1f2a64

commit a96939b669f8adfad7bb633aa9acfa18fe72ff1e
Author: Adnan <adnan@cyngn.com>
Date:   Mon Jul 28 11:01:37 2014 -0700

    Catapult: Fix crashes for addition of next sections in list.

    Change-Id: I66d8e02523595655458d0f30d75ccfbe3b65e69d

commit 48dd4872ba59499e7cea950fe4b1f8e4c6774a24
Author: Adnan <adnan@cyngn.com>
Date:   Mon Jul 28 11:59:20 2014 -0700

    Catapult: Place all special or numerics in a single category.

      - Also implement AutoFitTextView for character resizing.

    Change-Id: Ida4e702b43dc934835021cbbf3e0b41d9cea0b16

commit 40ed85a3f518dcabfbf8533f534934e029cb3835
Author: Adnan <adnan@cyngn.com>
Date:   Mon Jul 28 13:22:14 2014 -0700

    Catapult: Disable split touch events within drawer item.

    Change-Id: I990717140d5b420b9a658aede317206947e9fbce

commit d76583a1a4e5dd0a5792ce6d39adc427934d7db9
Author: Adnan <adnan@cyngn.com>
Date:   Mon Jul 28 15:53:23 2014 -0700

    Catapult: Add spacer to last item in list.

    Change-Id: Ia3f2d7d12c09886ab24e8976549518c1bb1a9a0b

commit 467e9cb6428b33fd6846be8d30bb8dcfe127acdf
Author: Adnan <adnan@cyngn.com>
Date:   Tue Jul 29 12:39:37 2014 -0700

    Catapult: Group special characters together under section.

    Change-Id: Ic2508eb101e1604c9e1544bdc858c7487f426a44

commit 1f566b1b5b9bac71d0d79d07084f024ba67982e1
Author: Danesh M <danesh@cyngn.com>
Date:   Tue Jul 29 14:25:26 2014 -0700

    Catapult : Fix scrubber

    - Make seekbar height of entire scrubber
    - Cancel viewproperty animator instead of Animation
    - Reduce scrubber animation duration
    - Ignore swipe events if in scrubber area

    Change-Id: I3a80b5bc392105bd1d5deff1defed8c083512029

commit b54ace6ee3ecca153f4c8fd2cda35366b205106f
Author: Danesh M <danesh@cyngn.com>
Date:   Tue Jul 29 14:29:44 2014 -0700

    Catapult : Check if appdrawer is null when intercepting

    Change-Id: I8d1b095acc8484d2ffb3f3ffc07608a639c9a3a3

commit 7a544638641e953aa2e75e6bc3f353906887440e
Author: Adnan <adnan@cyngn.com>
Date:   Tue Jul 29 18:23:30 2014 -0700

    Catapult: Use isLetter to fix locale issues in some languages.

    Change-Id: I253139ab3a93a9b48d3158f790e3975f776ce666

commit 96d1198ec28e5b858aa5cda268eecdf2335c6cf2
Author: Danesh Mondegarian <danesh@cyngn.com>
Date:   Fri Aug 8 23:30:15 2014 -0700

    Catapult : Improve scrubber 9patch

    Change-Id: Ide249c0fe269d2f8966c753f6fdd9c1f673a0df9

commit 4920d0fdd94f7b0df6fccc3d16f5b98cbf4d19a2
Author: Danesh M <danesh@cyngn.com>
Date:   Fri Aug 8 15:44:20 2014 -0700

    Catapult : Improve app drawer perf

    Change-Id: I78f699dbeac2618dceaa463940175e33ce685677

commit 10004f024b01029b2c137520407cefb5568b8c47
Author: Raj Yengisetty <rajesh@cyngn.com>
Date:   Thu Feb 26 11:42:17 2015 -0800

    Remove scrubber swipe logic from Workspace

    Change-Id: I44d94a412ccdb60ce0f537fd6ddb71c2daffc906

Change-Id: Ibf6152352520ece4dff201b8013378a1ad562894

Change-Id: I5c2d43a14e06c3ccc6297eff0950e061619d9b76

Update the grid when the custom values are changed

Repro:
 - Set custom grid to 7x7
 - press home and observe grid is updated to 7x7
 - Set custom grid to 2x3
 - press home and observe that the grid isn't updated

Change-Id: I8284eff08a96992b01b406ec1bff61f38d0ca683

Change-Id: Iee67f7ef3d7e8e897b4f9d9aaabba65a1387a9d7