OSDN Git Service

android-x86/packages-apps-Trebuchet.git
9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Oct 2014 17:45:24 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: I90af76842559cbe6a1a9629b9291eac0ea62db27
Auto-generated-cl: translation import

9 years agoam 951e8812: am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
Adam Cohen [Tue, 14 Oct 2014 22:19:41 +0000 (22:19 +0000)]
am 951e8812: am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop

* commit '951e8812abb5a104abbbdd708e69262aa539e6d2':
  Fixing typo from previous CL

9 years agoam 4079337e: am 755dd702: Merge "Fix missing screen when adding widget directly to...
Adam Cohen [Tue, 14 Oct 2014 22:19:40 +0000 (22:19 +0000)]
am 4079337e: am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop

* commit '4079337ea73706931cae80f35aba8375ff729816':
  Fix missing screen when adding widget directly to provider

9 years agoam c03f8c04: (-s ours) am 8cce9dd8: (-s ours) DO NOT MERGE Rechecking unrestored...
Sunny Goyal [Tue, 14 Oct 2014 22:19:40 +0000 (22:19 +0000)]
am c03f8c04: (-s ours) am 8cce9dd8: (-s ours) DO NOT MERGE Rechecking unrestored items when launcher gets created

* commit 'c03f8c04714b919999dafa1551d6a2834ce6e15b':
  DO NOT MERGE Rechecking unrestored items when launcher gets created

9 years agoam ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
Adam Cohen [Tue, 14 Oct 2014 22:15:32 +0000 (22:15 +0000)]
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop

* commit 'ae5f7ce8ed2e385cba8d65a67d9b108c9c3590e8':
  Fixing typo from previous CL

9 years agoam 755dd702: Merge "Fix missing screen when adding widget directly to provider" into...
Adam Cohen [Tue, 14 Oct 2014 22:15:32 +0000 (22:15 +0000)]
am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop

* commit '755dd70238162d0b631a8a17c42047c61318be30':
  Fix missing screen when adding widget directly to provider

9 years agoam 8cce9dd8: (-s ours) DO NOT MERGE Rechecking unrestored items when launcher gets...
Sunny Goyal [Tue, 14 Oct 2014 22:15:31 +0000 (22:15 +0000)]
am 8cce9dd8: (-s ours) DO NOT MERGE Rechecking unrestored items when launcher gets created

* commit '8cce9dd83aecd90920db751ab3f8fb6969f087c5':
  DO NOT MERGE Rechecking unrestored items when launcher gets created

9 years agoMerge "Fixing typo from previous CL" into ub-now-porkchop
Adam Cohen [Tue, 14 Oct 2014 22:09:00 +0000 (22:09 +0000)]
Merge "Fixing typo from previous CL" into ub-now-porkchop

9 years agoFixing typo from previous CL
Adam Cohen [Tue, 14 Oct 2014 22:04:34 +0000 (15:04 -0700)]
Fixing typo from previous CL

Bug 17969770

Change-Id: I4ea04864000d2ed8368ca81ba8cff42b4208d13d

9 years agoMerge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
Adam Cohen [Tue, 14 Oct 2014 22:00:41 +0000 (22:00 +0000)]
Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop

9 years agoDO NOT MERGE
Sunny Goyal [Tue, 14 Oct 2014 18:07:33 +0000 (11:07 -0700)]
DO NOT MERGE
Rechecking unrestored items when launcher gets created

Bug: 17941096
Change-Id: Ic54464a9c64442d6784cda44ef22fa3d08e22f1f

9 years agoFix missing screen when adding widget directly to provider
Adam Cohen [Tue, 14 Oct 2014 15:55:28 +0000 (08:55 -0700)]
Fix missing screen when adding widget directly to provider

bug: 17969770
Change-Id: Icbd8451d8adde0519917a7bf06365517405759fe

9 years agoam 76229a7c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 13:21:36 +0000 (13:21 +0000)]
am 76229a7c: (-s ours) Import translations. DO NOT MERGE

* commit '76229a7ccca69e92700f7b5f9d54739ee67276be':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 13:08:57 +0000 (06:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iebcf569cfe852de6157c7dae569f7c607a63671d
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 13:08:16 +0000 (06:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9c6ef0fac498e06571d99b3117509d1fdeddd792
Auto-generated-cl: translation import

9 years agoam 0014ca20: Removing some dead code
Adam Cohen [Fri, 10 Oct 2014 02:12:05 +0000 (02:12 +0000)]
am 0014ca20: Removing some dead code

* commit '0014ca20aa35f8937ff0df105e620fba02a538a3':
  Removing some dead code

9 years agoRemoving some dead code
Adam Cohen [Fri, 10 Oct 2014 01:43:18 +0000 (18:43 -0700)]
Removing some dead code

Change-Id: Idbd49302fc7123f72c7dad4c50612aaa662cca0d

9 years agoam 05700ad3: Merge "Keeping icons in disabled state when SD-card is unmounted" into...
Sunny Goyal [Wed, 8 Oct 2014 18:14:16 +0000 (18:14 +0000)]
am 05700ad3: Merge "Keeping icons in disabled state when SD-card is unmounted" into ub-now-queens

* commit '05700ad38f07d859f28a8e5d0cf65137c7c85d23':
  Keeping icons in disabled state when SD-card is unmounted

9 years agoMerge "Keeping icons in disabled state when SD-card is unmounted" into ub-now-queens
Sunny Goyal [Wed, 8 Oct 2014 18:10:39 +0000 (18:10 +0000)]
Merge "Keeping icons in disabled state when SD-card is unmounted" into ub-now-queens

9 years agoKeeping icons in disabled state when SD-card is unmounted
Sunny Goyal [Thu, 2 Oct 2014 22:58:31 +0000 (15:58 -0700)]
Keeping icons in disabled state when SD-card is unmounted

> changing shortcutInfo.isDisabled to be a flag based variable
> on received OnPackageUnavailable, icons are disabled from desktop
instead of being removed. Icons in all apps are removed

Bug: 15852084
Bug: 16238283
Change-Id: I126d23c709682a917d4bbb84de71032593dce8f9

9 years agoam de326d08: Merge "Using DeviceDefault theme for Launcher and WallpaperPicker" into...
Sunny Goyal [Wed, 8 Oct 2014 17:32:09 +0000 (17:32 +0000)]
am de326d08: Merge "Using DeviceDefault theme for Launcher and WallpaperPicker" into ub-now-queens

* commit 'de326d08d8764e7f9c610a5c9b755bfa78ae2eb9':
  Using DeviceDefault theme for Launcher and WallpaperPicker

9 years agoam 7bda3d26: Merge "Updating the wallpaperpicker thumb selection feedback" into ub...
Sunny Goyal [Wed, 8 Oct 2014 17:32:08 +0000 (17:32 +0000)]
am 7bda3d26: Merge "Updating the wallpaperpicker thumb selection feedback" into ub-now-queens

* commit '7bda3d26c77a5aa09d0c391d9d20125b8133801b':
  Updating the wallpaperpicker thumb selection feedback

9 years agoMerge "Using DeviceDefault theme for Launcher and WallpaperPicker" into ub-now-queens
Sunny Goyal [Wed, 8 Oct 2014 17:31:10 +0000 (17:31 +0000)]
Merge "Using DeviceDefault theme for Launcher and WallpaperPicker" into ub-now-queens

9 years agoMerge "Updating the wallpaperpicker thumb selection feedback" into ub-now-queens
Sunny Goyal [Wed, 8 Oct 2014 17:30:42 +0000 (17:30 +0000)]
Merge "Updating the wallpaperpicker thumb selection feedback" into ub-now-queens

9 years agoUsing DeviceDefault theme for Launcher and WallpaperPicker
Sunny Goyal [Wed, 8 Oct 2014 16:55:24 +0000 (09:55 -0700)]
Using DeviceDefault theme for Launcher and WallpaperPicker

Change-Id: I31bfeedd99d50683fba910f233b25bb3f364ce1f

9 years agoUpdating the wallpaperpicker thumb selection feedback
Sunny Goyal [Tue, 7 Oct 2014 04:37:30 +0000 (21:37 -0700)]
Updating the wallpaperpicker thumb selection feedback

> Using shape drawable instead of 9-patch image
> For L and above, using ripple click feedback with a tick
when selected. The vector path for tick is from go/icons ('Done')

Bug: 17897837

Change-Id: Ic9c9e455eb8bc39322b1474dd55432961b9a6498

9 years agoam b50cc8c5: Updating icons for sortcuts when the target app updates.
Sunny Goyal [Tue, 7 Oct 2014 22:05:00 +0000 (22:05 +0000)]
am b50cc8c5: Updating icons for sortcuts when the target app updates.

* commit 'b50cc8c5d6125715b139d978887830a5341971aa':
  Updating icons for sortcuts when the target app updates.

9 years agoUpdating icons for sortcuts when the target app updates.
Sunny Goyal [Mon, 6 Oct 2014 23:23:56 +0000 (16:23 -0700)]
Updating icons for sortcuts when the target app updates.

Bug: 17398260
Change-Id: I055abb971d1f72245e8616ac2ce07bcdf37cdd52

9 years agoam 2fce90c3: Cleaning up icon resizing code
Sunny Goyal [Tue, 7 Oct 2014 20:49:02 +0000 (20:49 +0000)]
am 2fce90c3: Cleaning up icon resizing code

* commit '2fce90c38a79d318e96a28107dea287e42509861':
  Cleaning up icon resizing code

9 years agoCleaning up icon resizing code
Sunny Goyal [Tue, 7 Oct 2014 19:01:58 +0000 (12:01 -0700)]
Cleaning up icon resizing code

> For resizing icons, scaling them down instead of cropping them
> Removing duplicate methods and variables

Bug: 17663119
Change-Id: I0f270860c0edaaa939495e63e05da841a603f6e9

9 years agoam 33de9454: am 0c2918f4: Use View.generateViewId if available
Ian Parkinson [Mon, 6 Oct 2014 17:03:46 +0000 (17:03 +0000)]
am 33de9454: am 0c2918f4: Use View.generateViewId if available

* commit '33de945451e1380eff2f4c6cd3aa5bb32c0ad368':
  Use View.generateViewId if available

9 years agoam 0c2918f4: Use View.generateViewId if available
Ian Parkinson [Mon, 6 Oct 2014 16:59:53 +0000 (16:59 +0000)]
am 0c2918f4: Use View.generateViewId if available

* commit '0c2918f4f4c4a9a6609b82cf23155ed51840f2c8':
  Use View.generateViewId if available

9 years agoam b2331f66: Merge "Create a central list of files the Launcher writes to the app...
Helena Josol [Mon, 6 Oct 2014 16:28:44 +0000 (16:28 +0000)]
am b2331f66: Merge "Create a central list of files the Launcher writes to the app directory" into ub-now-queens

* commit 'b2331f6601d26cf042e70070e1ef32fe06827f4d':
  Create a central list of files the Launcher writes to the app directory

9 years agoMerge "Create a central list of files the Launcher writes to the app directory" into...
Helena Josol [Mon, 6 Oct 2014 16:25:56 +0000 (16:25 +0000)]
Merge "Create a central list of files the Launcher writes to the app directory" into ub-now-queens

9 years agoCreate a central list of files the Launcher writes to the app directory
Helena Josol [Mon, 6 Oct 2014 15:06:46 +0000 (16:06 +0100)]
Create a central list of files the Launcher writes to the app directory

Replace hardcoded Launcher filenames with the defined constants.

Bug: 12753154
Change-Id: I072f202d9388a703b9e6851bde64ea7fafe4b10a

9 years agoUse View.generateViewId if available
Ian Parkinson [Mon, 6 Oct 2014 13:24:31 +0000 (14:24 +0100)]
Use View.generateViewId if available

Bug: 17456181
Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389

9 years agoam e2f25947: am 4b8d11fc: Add missing xxhdpi asset
Adam Cohen [Fri, 3 Oct 2014 21:01:35 +0000 (21:01 +0000)]
am e2f25947: am 4b8d11fc: Add missing xxhdpi asset

* commit 'e2f25947844e7cd1f28c367eade49038347c658d':
  Add missing xxhdpi asset

9 years agoam 4b8d11fc: Add missing xxhdpi asset
Adam Cohen [Fri, 3 Oct 2014 20:58:06 +0000 (20:58 +0000)]
am 4b8d11fc: Add missing xxhdpi asset

* commit '4b8d11fcb396760eca75cf2b055a7acd05c594ec':
  Add missing xxhdpi asset

9 years agoAdd missing xxhdpi asset
Adam Cohen [Fri, 3 Oct 2014 20:19:33 +0000 (13:19 -0700)]
Add missing xxhdpi asset

Bug: 17813013
Change-Id: If1e3448fb109e3f7f0c1ae6562a795fecf3bdf42

9 years agoam ebb2a66b: am 0cd27191: Merge "Remove reference to CODENAME from compat code."...
Kenny Guy [Fri, 3 Oct 2014 12:22:44 +0000 (12:22 +0000)]
am ebb2a66b: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop

* commit 'ebb2a66b79b2761ed29f2f8a3140217c126e448b':
  Remove reference to CODENAME from compat code.

9 years agoam 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
Kenny Guy [Fri, 3 Oct 2014 12:20:24 +0000 (12:20 +0000)]
am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop

* commit '0cd271918a7c7baa69e872f7128351a0c7dbbbae':
  Remove reference to CODENAME from compat code.

9 years agoMerge "Remove reference to CODENAME from compat code." into ub-now-porkchop
Kenny Guy [Fri, 3 Oct 2014 12:16:59 +0000 (12:16 +0000)]
Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop

9 years agoRemove reference to CODENAME from compat code.
Kenny Guy [Fri, 3 Oct 2014 11:15:53 +0000 (12:15 +0100)]
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

9 years agoam adf571c7: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with...
Adam Cohen [Tue, 30 Sep 2014 23:08:03 +0000 (23:08 +0000)]
am adf571c7: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop

* commit 'adf571c7725f0281a3e37a4b6254818da956ca53':
  Don't let old Launcher activity interfere with new one

9 years agoam 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into...
Adam Cohen [Tue, 30 Sep 2014 23:05:26 +0000 (23:05 +0000)]
am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop

* commit '52077b7a951153ce77e7354c6096b3bcfbec8c3e':
  Don't let old Launcher activity interfere with new one

9 years agoMerge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop
Adam Cohen [Tue, 30 Sep 2014 23:03:40 +0000 (23:03 +0000)]
Merge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop

9 years agoam ebdb7fcc: am 2ed99e86: Build Launcher3 against prebuilt SDK 21
Bjorn Bringert [Tue, 30 Sep 2014 20:37:05 +0000 (20:37 +0000)]
am ebdb7fcc: am 2ed99e86: Build Launcher3 against prebuilt SDK 21

* commit 'ebdb7fcc8ca851390bcf276929e8990ba23b6869':
  Build Launcher3 against prebuilt SDK 21

9 years agoam 2ed99e86: Build Launcher3 against prebuilt SDK 21
Bjorn Bringert [Tue, 30 Sep 2014 20:34:13 +0000 (20:34 +0000)]
am 2ed99e86: Build Launcher3 against prebuilt SDK 21

* commit '2ed99e861b4be73620fd6fdc24a13230e096921c':
  Build Launcher3 against prebuilt SDK 21

9 years agoBuild Launcher3 against prebuilt SDK 21
Bjorn Bringert [Tue, 30 Sep 2014 17:53:39 +0000 (18:53 +0100)]
Build Launcher3 against prebuilt SDK 21

Bug: 17507423
Change-Id: I9d6dc856bb29e5d0b3926bde437895d0f2ca7b74

9 years agoDon't let old Launcher activity interfere with new one
Adam Cohen [Tue, 30 Sep 2014 16:48:49 +0000 (09:48 -0700)]
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

9 years agoam 10d03955: am 6d467e27: Merge "Resetting launcherProvider data if restore set was...
Sunny Goyal [Mon, 29 Sep 2014 15:31:55 +0000 (15:31 +0000)]
am 10d03955: am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop

* commit '10d03955def60ffa28717cd113c74a18219e2e81':
  Resetting launcherProvider data if restore set was empty

9 years agoam f82c86c2: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 29 Sep 2014 15:31:55 +0000 (15:31 +0000)]
am f82c86c2: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'f82c86c26c0ba9896b61270b48a8e4f82d7d7fde':
  Import translations. DO NOT MERGE

9 years agoam 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into...
Sunny Goyal [Mon, 29 Sep 2014 03:00:45 +0000 (03:00 +0000)]
am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop

* commit '6d467e27b7e16442d3fb56af2aa3d94e657dff25':
  Resetting launcherProvider data if restore set was empty

9 years agoam 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
Baligh Uddin [Mon, 29 Sep 2014 03:00:44 +0000 (03:00 +0000)]
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '1004713867fa4476201c02c95f35c64361a6dcf2':
  Import translations. DO NOT MERGE

9 years agoMerge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
Sunny Goyal [Mon, 29 Sep 2014 02:57:17 +0000 (02:57 +0000)]
Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop

9 years agoResetting launcherProvider data if restore set was empty
Sunny Goyal [Sat, 27 Sep 2014 05:09:29 +0000 (22:09 -0700)]
Resetting launcherProvider data if restore set was empty

Bug: 17332300
Change-Id: I6d2187cd1b1fa7a53e49b96eb109263f6b74b258

9 years agoMerge "Import translations. DO NOT MERGE" into ub-now-porkchop
Baligh Uddin [Sun, 28 Sep 2014 19:22:38 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

9 years agoam fdff96d3: am c5fb59fb: Fixing loadWorkspace being called multiple times Using...
Sunny Goyal [Fri, 26 Sep 2014 10:18:31 +0000 (10:18 +0000)]
am fdff96d3: am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons

* commit 'fdff96d385fdbbcb1d0a49853e89d60211a48cc7':
  Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons

9 years agoam c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent...
Sunny Goyal [Fri, 26 Sep 2014 10:07:36 +0000 (10:07 +0000)]
am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons

* commit 'c5fb59fb9a36180ce962f565d85aa92f9991da1a':
  Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons

9 years agoFixing loadWorkspace being called multiple times
Sunny Goyal [Thu, 25 Sep 2014 23:20:38 +0000 (16:20 -0700)]
Fixing loadWorkspace being called multiple times
Using right intent when refreshing shortcut icons

Bug: 17662782
Bug: 17663766
Bug: 17569197
Change-Id: I8d698c5e2145b8412aff9978db4ec930d89f7f24

9 years agoMerge "Prevent the inlining of ProviderConfig.AUTHORITY" into ub-now-master
Vikram Aggarwal [Thu, 25 Sep 2014 20:26:02 +0000 (20:26 +0000)]
Merge "Prevent the inlining of ProviderConfig.AUTHORITY" into ub-now-master

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Sep 2014 18:44:09 +0000 (11:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I619612c919567fdaec3d7d0f5b9a33c94439c759
Auto-generated-cl: translation import

9 years agoam e9461be3: am f876301d: UI Fixes
Sunny Goyal [Wed, 24 Sep 2014 16:46:43 +0000 (16:46 +0000)]
am e9461be3: am f876301d: UI Fixes

* commit 'e9461be3cfc7fd5b8956b84aea3184474c366eba':
  UI Fixes

9 years agoam f876301d: UI Fixes
Sunny Goyal [Wed, 24 Sep 2014 01:47:17 +0000 (01:47 +0000)]
am f876301d: UI Fixes

* commit 'f876301d0a460bec260a3c7a6ab260a06d5817ba':
  UI Fixes

9 years agoPrevent the inlining of ProviderConfig.AUTHORITY
Sameer Padala [Wed, 24 Sep 2014 01:04:38 +0000 (18:04 -0700)]
Prevent the inlining of ProviderConfig.AUTHORITY

This intern() statement prevents AUTHORITY from being inlined into
LauncherProvider.AUTHORITY and LauncherSettings.Favorites.CONTENT_URI. If this
string is inlined, then it can't be overridded by libraries that depend on it.

Change-Id: I588b394291b70a01e3008c908a6ccb9b6cdfb6b9

9 years agoUI Fixes
Sunny Goyal [Tue, 23 Sep 2014 23:22:10 +0000 (16:22 -0700)]
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

9 years agoam 8fd74831: Source change to get code compiling on google3
Sameer Padala [Mon, 22 Sep 2014 23:29:57 +0000 (23:29 +0000)]
am 8fd74831: Source change to get code compiling on google3

* commit '8fd74831de067fbadad180c54f70fb4a5375a933':
  Source change to get code compiling on google3

9 years agoSource change to get code compiling on google3
Sameer Padala [Mon, 8 Sep 2014 23:00:29 +0000 (16:00 -0700)]
Source change to get code compiling on google3

Change-Id: Ib16df8dd9caa04903a664d8cf92767107fe57628

9 years agoam 12429e46: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actuall...
Adam Cohen [Sat, 20 Sep 2014 07:04:19 +0000 (07:04 +0000)]
am 12429e46: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop

* commit '12429e46b195281e0c43c8edfaf23b8ae42e76ff':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank

9 years agoam d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring...
Adam Cohen [Sat, 20 Sep 2014 06:54:14 +0000 (06: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

* commit 'd8f6253e67d23dcdcf521b0558f193ae832743b2':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank

9 years agoMerge "When ensuring screen exists, make sure it's actually referring to a screen...
Adam Cohen [Sat, 20 Sep 2014 06:45:53 +0000 (06:45 +0000)]
Merge "When ensuring screen exists, make sure it's actually referring to a screen, not a rank" into ub-now-porkchop

9 years agoam a703eb0f: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sat, 20 Sep 2014 04:38:36 +0000 (04:38 +0000)]
am a703eb0f: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'a703eb0fdf4b722939d601f667c0d123e86b59a7':
  Import translations. DO NOT MERGE

9 years agoam 153c3ddc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens
Baligh Uddin [Sat, 20 Sep 2014 04:35:20 +0000 (04:35 +0000)]
am 153c3ddc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

* commit '153c3ddc833d10058433c008f9933a765f0261b8':
  Import translations. DO NOT MERGE

9 years agoam 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
Baligh Uddin [Sat, 20 Sep 2014 04:32:31 +0000 (04:32 +0000)]
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '68207e2532b2059e513a1c4e33c3c52e1ac1e559':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into ub-now-master
Baligh Uddin [Sat, 20 Sep 2014 04:22:32 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-master

9 years agoMerge "Import translations. DO NOT MERGE" into ub-now-porkchop
Baligh Uddin [Sat, 20 Sep 2014 04:22:31 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

9 years agoMerge "Import translations. DO NOT MERGE" into ub-now-queens
Baligh Uddin [Sat, 20 Sep 2014 04:22:29 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-queens

9 years agoWhen ensuring screen exists, make sure it's actually referring to a screen, not a...
Adam Cohen [Sat, 20 Sep 2014 00:43:08 +0000 (17:43 -0700)]
When ensuring screen exists, make sure it's actually referring to a screen, not a rank

Bug: 17496589
Change-Id: If60e22dd71fa32530db91e37057689de5fb25646

9 years agoam f2316a73: am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBad...
Sunny Goyal [Fri, 19 Sep 2014 20:09:46 +0000 (20:09 +0000)]
am f2316a73: am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop

* commit 'f2316a7386e6fc0c0b5caf6e341876a26c6cddad':
  Updating promise icon's bitmap and label when onBadgingChanged is received

9 years agoam acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged...
Sunny Goyal [Fri, 19 Sep 2014 20:03:48 +0000 (20:03 +0000)]
am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop

* commit 'acefecbff3141b43dc55fe18146cf842d1d4a8ae':
  Updating promise icon's bitmap and label when onBadgingChanged is received

9 years agoam 06f4dc5d: am 7e053f87: Merge "Changing intent action for auto installs" into ub...
Sunny Goyal [Fri, 19 Sep 2014 20:03:36 +0000 (20:03 +0000)]
am 06f4dc5d: am 7e053f87: Merge "Changing intent action for auto installs" into ub-now-porkchop

* commit '06f4dc5dfcaa1fd11a7be387d6b233a61a4a55fe':
  Changing intent action for auto installs

9 years agoam cb0ec764: am 66af82cc: Merge "Adding support to delete unrestored icons and widget...
Sunny Goyal [Fri, 19 Sep 2014 20:03:35 +0000 (20:03 +0000)]
am cb0ec764: am 66af82cc: Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop

* commit 'cb0ec764daa41302cbd2a5bac038ac33d9fc6866':
  Adding support to delete unrestored icons and widgets

9 years agoMerge "Updating promise icon's bitmap and label when onBadgingChanged is received...
Sunny Goyal [Fri, 19 Sep 2014 19:58:07 +0000 (19:58 +0000)]
Merge "Updating promise icon's bitmap and label when onBadgingChanged is received" into ub-now-porkchop

9 years agoam 7e053f87: Merge "Changing intent action for auto installs" into ub-now-porkchop
Sunny Goyal [Fri, 19 Sep 2014 19:57:35 +0000 (19:57 +0000)]
am 7e053f87: Merge "Changing intent action for auto installs" into ub-now-porkchop

* commit '7e053f8784c886359f911161db5fd8b61333450d':
  Changing intent action for auto installs

9 years agoam 66af82cc: Merge "Adding support to delete unrestored icons and widgets" into ub...
Sunny Goyal [Fri, 19 Sep 2014 19:57:34 +0000 (19:57 +0000)]
am 66af82cc: Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop

* commit '66af82cca76b313366e5429489aed85679c2c76e':
  Adding support to delete unrestored icons and widgets

9 years agoMerge "Changing intent action for auto installs" into ub-now-porkchop
Sunny Goyal [Fri, 19 Sep 2014 19:51:42 +0000 (19:51 +0000)]
Merge "Changing intent action for auto installs" into ub-now-porkchop

9 years agoMerge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop
Sunny Goyal [Fri, 19 Sep 2014 19:50:25 +0000 (19:50 +0000)]
Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop

9 years agoChanging intent action for auto installs
Sunny Goyal [Thu, 18 Sep 2014 21:36:48 +0000 (14:36 -0700)]
Changing intent action for auto installs

Bug: 17425805
Change-Id: I12e94860206ed62d6ba04f0b5734cc55ba414e45

9 years agoAdding support to delete unrestored icons and widgets
Sunny Goyal [Thu, 18 Sep 2014 23:13:58 +0000 (16:13 -0700)]
Adding support to delete unrestored icons and widgets

Bug: 17584719
Change-Id: If8e76fc80ea885c9004c50b7b6a9353525a50105

9 years agoUpdating promise icon's bitmap and label when onBadgingChanged is received
Sunny Goyal [Thu, 18 Sep 2014 20:25:15 +0000 (13:25 -0700)]
Updating promise icon's bitmap and label when onBadgingChanged is received

Bug: 17583799
Change-Id: I68b4f9d4086c43bd949ad8b46b574ec78edb32db

9 years agoam 2e9eb2a6: am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when...
Sunny Goyal [Fri, 19 Sep 2014 18:15:58 +0000 (18:15 +0000)]
am 2e9eb2a6: am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there is no migration cling" into ub-now-porkchop

* commit '2e9eb2a6a0995aa94248b9b230fefc92feec6b1f':
  Fix: First run cling shoud show 'Welcome' when there is no migration cling

9 years agoam 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there is no...
Sunny Goyal [Fri, 19 Sep 2014 18:09:53 +0000 (18:09 +0000)]
am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there is no migration cling" into ub-now-porkchop

* commit '92e97dccab3d7016e0740648e1d467e37a42f3f8':
  Fix: First run cling shoud show 'Welcome' when there is no migration cling

9 years agoMerge "Fix: First run cling shoud show 'Welcome' when there is no migration cling...
Sunny Goyal [Fri, 19 Sep 2014 18:02:25 +0000 (18:02 +0000)]
Merge "Fix: First run cling shoud show 'Welcome' when there is no migration cling" into ub-now-porkchop

9 years agoFix: First run cling shoud show 'Welcome' when there is no migration cling
Sunny Goyal [Fri, 19 Sep 2014 17:14:48 +0000 (10:14 -0700)]
Fix: First run cling shoud show 'Welcome' when there is no migration cling

Bug: 17582926
Change-Id: I662e0ed9f12d237ee34a8f4540b339edee08c611

9 years agoam 0d89e1d7: am ddd5aaaf: Merge "Perform null check in animation complete" into ub...
Adam Cohen [Thu, 18 Sep 2014 15:33:21 +0000 (15:33 +0000)]
am 0d89e1d7: am ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop

* commit '0d89e1d764216baf4e57f1dee7bbf7b3c462be97':
  Perform null check in animation complete

9 years agoam ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop
Adam Cohen [Thu, 18 Sep 2014 15:27:49 +0000 (15:27 +0000)]
am ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop

* commit 'ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a':
  Perform null check in animation complete

9 years agoMerge "Perform null check in animation complete" into ub-now-porkchop
Adam Cohen [Thu, 18 Sep 2014 15:19:39 +0000 (15:19 +0000)]
Merge "Perform null check in animation complete" into ub-now-porkchop

9 years agoPerform null check in animation complete
Adam Cohen [Thu, 18 Sep 2014 15:11:05 +0000 (08:11 -0700)]
Perform null check in animation complete

Bug 17561235

Change-Id: I280dca9e03eed3f4e1edd97f2f8efac0b5e4b29d

9 years agoam e4bafbb3: am c0b89b72: Merge "Update calls now we have an L API version." into...
Kenny Guy [Thu, 18 Sep 2014 12:27:46 +0000 (12:27 +0000)]
am e4bafbb3: am c0b89b72: Merge "Update calls now we have an L API version." into ub-now-porkchop

* commit 'e4bafbb3ce33f6d0017de3c00d967bba48737464':
  Update calls now we have an L API version.

9 years agoam a7b95f2a: am 850d471b: Remove catch now api has hit googlefood.
Kenny Guy [Thu, 18 Sep 2014 12:27:46 +0000 (12:27 +0000)]
am a7b95f2a: am 850d471b: Remove catch now api has hit googlefood.

* commit 'a7b95f2a39e9059b7229cf73e6a2e5b8eac98df9':
  Remove catch now api has hit googlefood.