Commit Graph

8630 Commits

Author SHA1 Message Date
Bjorn Bringert 7a20d40ffe am 27414260: am b6ccd36a: am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose
* commit '27414260a7724290364c149fe3d0c3a153ae9662':
2014-10-23 17:25:10 +00:00
Baligh Uddin db90cb6081 am 0e27ebef: (-s ours) am dc6f6268: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE
* commit '0e27ebef5b54b6ac2e57c29da5791e6539535e98':
2014-10-23 17:25:09 +00:00
Ed Heyl 8695789a3f am 10f0db9f: keep history after reset to git reset to 8246a1434c
* commit '10f0db9f79256b7e02b65f341853d7238480f343':
  override Launcher2 (aosp)
2014-10-23 17:25:08 +00:00
Adam Cohen ae5f7ce8ed Merge "Fixing typo from previous CL" into ub-now-porkchop 2014-10-14 22:09:00 +00:00
Adam Cohen d61a638e99 Fixing typo from previous CL
Bug 17969770

Change-Id: I4ea04864000d2ed8368ca81ba8cff42b4208d13d
2014-10-14 15:06:54 -07:00
Adam Cohen 755dd70238 Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop 2014-10-14 22:00:42 +00:00
Sunny Goyal 8cce9dd83a DO NOT MERGE
Rechecking unrestored items when launcher gets created

Bug: 17941096
Change-Id: Ic54464a9c64442d6784cda44ef22fa3d08e22f1f
2014-10-14 14:02:31 -07:00
Adam Cohen eb1ac42fd4 Fix missing screen when adding widget directly to provider
bug: 17969770
Change-Id: Icbd8451d8adde0519917a7bf06365517405759fe
2014-10-14 10:36:27 -07:00
Ian Parkinson 0c2918f4f4 Use View.generateViewId if available
Bug: 17456181
Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389
2014-10-06 14:27:16 +01:00
Adam Cohen 4b8d11fcb3 Add missing xxhdpi asset
Bug: 17813013
Change-Id: If1e3448fb109e3f7f0c1ae6562a795fecf3bdf42
2014-10-03 13:47:11 -07:00
Kenny Guy 0cd271918a Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop 2014-10-03 12:16:59 +00:00
Kenny Guy 92d6d3b275 Remove reference to CODENAME from compat code.
Fixes bug with uninstalling apps for managed profile
as codename check means it fails to include the user
when uninstalling the app.

Bug: 17800161
Change-Id: I6901eff5aa8f00fb3b859e8db37930b95f031625
2014-10-03 12:15:53 +01:00
Adam Cohen 52077b7a95 Merge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop 2014-09-30 23:03:40 +00:00
Bjorn Bringert 2ed99e861b Build Launcher3 against prebuilt SDK 21
Bug: 17507423
Change-Id: I9d6dc856bb29e5d0b3926bde437895d0f2ca7b74
2014-09-30 18:53:39 +01:00
Adam Cohen 1a85c5839c Don't let old Launcher activity interfere with new one
-> Launcher uses a static instance of it's loader (across
   multiple activities) since activities can come and go
   (configuration change, eg.) but the data model and loading
   is static.
-> Currently, this is not robust to a sequence of events that
   looks like onCreate(instance A), onCreate(instance B),
   onDestroy(instance B) -- depending on the timing of those
   calls.
-> This CL addresses a symptom of the above scenario by not
   allowing an older Launcher Activity cancel the loader /
   clear the callbacks for a newer Activity.

Bug 17679693

Change-Id: I8ece93e288464b0d578b9669c165b67132d997ed
2014-09-30 10:23:18 -07:00
Sunny Goyal 6d467e27b7 Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop 2014-09-29 02:57:18 +00:00
Sunny Goyal 42de82ff8d Resetting launcherProvider data if restore set was empty
Bug: 17332300
Change-Id: I6d2187cd1b1fa7a53e49b96eb109263f6b74b258
2014-09-28 17:02:03 -07:00
Baligh Uddin 1004713867 Merge "Import translations. DO NOT MERGE" into ub-now-porkchop 2014-09-28 19:22:39 +00:00
Sunny Goyal c5fb59fb9a Fixing loadWorkspace being called multiple times
Using right intent when refreshing shortcut icons

Bug: 17662782
Bug: 17663766
Bug: 17569197
Change-Id: I8d698c5e2145b8412aff9978db4ec930d89f7f24
2014-09-26 01:07:11 +00:00
Baligh Uddin 090f9a6756 Import translations. DO NOT MERGE
Change-Id: I619612c919567fdaec3d7d0f5b9a33c94439c759
Auto-generated-cl: translation import
2014-09-25 11:44:09 -07:00
Sunny Goyal f876301d0a UI Fixes
> Adding a scrim to the longpress cling

Bug: 17573777

High level design asks (very low-risk)
> Changing the dialog to use device default theme
> Updating screenpanel assets

Change-Id: Ia0216b60fd8cd607d83a5e7c3d7e6c8255125eda
2014-09-23 16:33:26 -07:00
Adam Cohen d8f6253e67 Merge "When ensuring screen exists, make sure it's actually referring to a screen, not a rank" into ub-now-porkchop 2014-09-20 06:45:54 +00:00
Baligh Uddin 68207e2532 Merge "Import translations. DO NOT MERGE" into ub-now-porkchop 2014-09-20 04:22:31 +00:00
Adam Cohen 83079e43ae When ensuring screen exists, make sure it's actually referring to a screen, not a rank
Bug: 17496589
Change-Id: If60e22dd71fa32530db91e37057689de5fb25646
2014-09-19 17:46:32 -07:00
Sunny Goyal acefecbff3 Merge "Updating promise icon's bitmap and label when onBadgingChanged is received" into ub-now-porkchop 2014-09-19 19:58:07 +00:00
Sunny Goyal 7e053f8784 Merge "Changing intent action for auto installs" into ub-now-porkchop 2014-09-19 19:51:42 +00:00
Sunny Goyal 66af82cca7 Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop 2014-09-19 19:50:26 +00:00
Sunny Goyal 2233c8850d Changing intent action for auto installs
Bug: 17425805
Change-Id: I12e94860206ed62d6ba04f0b5734cc55ba414e45
2014-09-19 12:23:34 -07:00
Sunny Goyal 9448536b11 Adding support to delete unrestored icons and widgets
Bug: 17584719
Change-Id: If8e76fc80ea885c9004c50b7b6a9353525a50105
2014-09-19 12:19:07 -07:00
Sunny Goyal a22666f681 Updating promise icon's bitmap and label when onBadgingChanged is received
Bug: 17583799
Change-Id: I68b4f9d4086c43bd949ad8b46b574ec78edb32db
2014-09-19 12:16:52 -07:00
Sunny Goyal 92e97dccab Merge "Fix: First run cling shoud show 'Welcome' when there is no migration cling" into ub-now-porkchop 2014-09-19 18:02:25 +00:00
Sunny Goyal af0628f84e Fix: First run cling shoud show 'Welcome' when there is no migration cling
Bug: 17582926
Change-Id: I662e0ed9f12d237ee34a8f4540b339edee08c611
2014-09-19 10:59:35 -07:00
Adam Cohen ddd5aaaf35 Merge "Perform null check in animation complete" into ub-now-porkchop 2014-09-18 15:19:40 +00:00
Adam Cohen 493f6bc142 Perform null check in animation complete
Bug 17561235

Change-Id: I280dca9e03eed3f4e1edd97f2f8efac0b5e4b29d
2014-09-18 08:14:05 -07:00
Kenny Guy c0b89b72af Merge "Update calls now we have an L API version." into ub-now-porkchop 2014-09-18 12:16:02 +00:00
Kenny Guy d794a3f465 Update calls now we have an L API version.
Bug: 17543647
Change-Id: I92c652a4ced5a5e783b24e42f9da4d9dfe1118ba
2014-09-18 13:07:49 +01:00
Kenny Guy 850d471b29 Remove catch now api has hit googlefood.
Bug: 17543647
Change-Id: Ie0b57719393a705e8c02b226d3e3f57dbf43d800
2014-09-18 12:58:18 +01:00
Adam Cohen 83e5941d8e Fix NPE in Workspace
Bug: 17503479
Change-Id: Ib20dfd67c5a755cd4b684163bb538a1bf77fa6ca
2014-09-17 16:47:08 -07:00
Sunny Goyal 136882c195 Merge "Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver" into ub-now-porkchop 2014-09-17 20:07:10 +00:00
Sunny Goyal d8293fbf28 Merge "Null check in flushInvalidIcons" into ub-now-porkchop 2014-09-17 19:43:14 +00:00
Sunny Goyal 16fe1dfd30 Merge "Updating shourcuts only when the corresponding user also matches the AppInfo" into ub-now-porkchop 2014-09-17 19:30:55 +00:00
Sunny Goyal 72f9865780 Merge "Using ApplicationContext in static objects" into ub-now-porkchop 2014-09-17 19:30:36 +00:00
Baligh Uddin dc6c83be17 Import translations. DO NOT MERGE
Change-Id: I4deb7f12992c8e75f889a434ce12df204d78265e
Auto-generated-cl: translation import
2014-09-16 22:14:08 -07:00
Dharmesh Mokani cc4e84ee3b Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchop 2014-09-17 03:10:10 +00:00
Sunny Goyal 5610fe72e0 Setting context in LauncherAppState before initialising it,
as it can be called from a BroadcastReceiver

Bug: 17519159
Change-Id: I0434a3d1c392e8861eb759d88942deaf98116c19
2014-09-16 09:42:49 -07:00
Sunny Goyal cf5d24b21a Using ApplicationContext in static objects
Bug: 17507543
Change-Id: I1651b694acabaf62188dd4ba42739b64a60194c3
2014-09-15 14:59:46 -07:00
Sunny Goyal 876d11e31a Null check in flushInvalidIcons
> Icons in a CacheEntry can be null, for a restored app. No
need to flush such entries on DeviceProfileChange

Bug: 17489687
Change-Id: If6e76206ae5bd8201c9928257706224f2f34c232
2014-09-15 08:51:08 -07:00
Sunny Goyal a20490cd9e Merge "Disabling debug logs" into ub-now-porkchop 2014-09-14 15:13:09 +00:00
Sunny Goyal 6a229267a4 Merge "Updating screenpanel assets" into ub-now-porkchop 2014-09-14 15:12:40 +00:00
Sunny Goyal 09775fe9f3 Updating screenpanel assets
Bug: 17414174
Change-Id: I05850fcd3802010160a604f3056a4b2ff3dc601d
2014-09-12 17:34:37 -07:00