OSDN Git Service
Hyunyoung Song [Thu, 28 May 2015 21:48:24 +0000 (21:48 +0000)]
Merge "Guard against monkey actor test NPE inside FocusHelper b/
19626762" into ub-launcher3-almonte
Hyunyoung Song [Thu, 28 May 2015 21:45:59 +0000 (14:45 -0700)]
Guard against monkey actor test NPE inside FocusHelper
b/
19626762
Change-Id: Icaff5931f4076323855f23e7165b0e78a11241b6
Adam Cohen [Fri, 22 May 2015 21:36:14 +0000 (14:36 -0700)]
[DO NOT MERGE] Use custom slide-up animation on LMP MR1 instead of system default
issue
21402755
Change-Id: I87ddef08e7b3134c791f769fc279e62d520cd18c
Sunny Goyal [Tue, 12 May 2015 20:30:07 +0000 (13:30 -0700)]
Preventing NullPointerException when cancelling a shortcut addition
Bug:
21024018
Change-Id: Iac09d9e4f1411aa9fe1ec89fbfe749b009c7d457
(cherry picked from commit
f044bb1edd8670fbc2cf9eeb1a51c31b91f0889c)
Hyunyoung Song [Tue, 21 Apr 2015 03:40:03 +0000 (20:40 -0700)]
Remove duplicate calls to getSortedWidgetsAndShortcuts
b/
19904873
Change-Id: I2e56bc0c7524caa2ef3c5fb00f35cb032cd1860b
Adam Cohen [Thu, 2 Apr 2015 18:53:23 +0000 (11:53 -0700)]
Stop using custom activity transition, rely on system default in these cases
-> workaround for platform issue related to this resource, but also
a decent code cleanup
issue
20006693
Change-Id: Iea3a2fb14be5ed78d882ddf9d970b12d177f4249
Robert Kozikowski [Mon, 30 Mar 2015 22:46:46 +0000 (23:46 +0100)]
Adding Launcher3 callbacks for trimming memory.
It will help reduce memory footprint of Launcher, when in background.
It is required to help deallocate images, when Google Now Launcher
goes into the background. See cl/
83222937/ .
Plan after this CL:
- Generate drop CL with launcher3_drop.sh. Add empty metods to
make code compile.
- Sync the cl/
83222937 and hide the code behind the feature flag.
It was previously submitted in ag/628070 and reverted in ag/630423
due to GSA release schedule.
Change-Id: I56eee618b86d518d0afc362b6cf44c3bbec1f19c
Adam Cohen [Sat, 28 Mar 2015 01:07:52 +0000 (18:07 -0700)]
Avoid casting AppWidgetProviderInfo to LauncherAppWidgetProviderInfo upon unparcel
issue
19904413
Change-Id: Ie1b4a2b1331f6a707f8590cd0396138a20946658
Adam Cohen [Fri, 27 Mar 2015 22:14:00 +0000 (15:14 -0700)]
Ensure that we capture all paths for starting activity for result
-> AppWidgetManagerCompatVL uses an IntentSender to launch the widget
config activity (to handle the case of cross profile config activities)
-> Launcher was not overriding this method, and so not capturing the fact
that we are waiting for a result.
issue
19723510
Change-Id: If5751e6d23d31c9f7b3b85f9464a93f935487cec
Robin Lee [Mon, 16 Mar 2015 19:41:43 +0000 (19:41 +0000)]
Don't clobber widgets with the same component - DO NOT MERGE
By not storing them in a HashMap keyed against ComponentName (which is
almost guaranteed to conflict with other widgets when managed profiles
are in play).
Bug:
19444068
Change-Id: I6ffce78e8aaf265196239670404cbdaff9fa09be
Sunny Goyal [Fri, 13 Mar 2015 17:26:27 +0000 (10:26 -0700)]
[DO NOT MERGE] Fixing build error in launcher_protoutil_lib
> Since test build rules were included before the launcher_protoutil_lib
rule, all the following paths got prefixed with "tests/" giving file
not found error
Change-Id: I13f96fc2f14336b0ff40f086176cc4afbc254791
(cherry picked from commit
d68725cd20be0c1d5ebd583da5fde0f007a69bf8)
Hyunyoung Song [Wed, 11 Mar 2015 23:36:52 +0000 (16:36 -0700)]
Fix widget refresh issue on package install/uninstall
Culprit CL: https://googleplex-android-review.git.corp.google.com/#/c/592303/3/src/com/android/launcher3/LauncherModel.java
b/
19658229
Change-Id: I02b0b2a0ed9bc3200bbe1edcb251cf0efe939e53
Sunny Goyal [Wed, 4 Mar 2015 17:51:18 +0000 (09:51 -0800)]
Clearing DB if necessary, when applying the default layout
Bug:
19574498
Change-Id: I34850d9a7f7316bcc2cb9fc8a5be57d2488c16a6
Sunny Goyal [Mon, 2 Mar 2015 22:24:21 +0000 (14:24 -0800)]
Fixing wronk rowID check.
Since screenId is changed to primary key, the rowId can now be 0 (earlier
it was auto-increment and never 0)
Bug:
19566734
Change-Id: Icf0e4294a581039101df1ad1756fdb6e581c4cba
Sunny Goyal [Wed, 25 Feb 2015 18:46:34 +0000 (10:46 -0800)]
DO NOT MERGE: Setting workspace id as primary key
Bug:
19475231
Change-Id: I0385e97868db73dafe148ce45af7dda4555ee593
Sunny Goyal [Tue, 10 Feb 2015 22:28:44 +0000 (14:28 -0800)]
Using SCREEN_ORIENTATION_LOCKED for locking to current orientation.
Bug:
17298128
Change-Id: If64b6957a594bcc48f6454689d11cd63d31b9239
(cherry picked from commit
3c1865ad5050f594d1684fe8962bfbc8ffcbe4bb)
Sunny Goyal [Tue, 17 Feb 2015 20:34:55 +0000 (20:34 +0000)]
Merge "Fixing crash when dragging and dropping a restored widget." into ub-launcher3-almonte
Sunny Goyal [Tue, 17 Feb 2015 19:44:15 +0000 (11:44 -0800)]
Fixing crash when dragging and dropping a restored widget.
> When the widget is in pending state, AppWidgetProviderInfo is not available
Bug:
19364311
Change-Id: If3126a375853e6e710c6eba4b8824e18f3f0d391
Adam Cohen [Sat, 14 Feb 2015 00:14:33 +0000 (16:14 -0800)]
Ensure that layers are properly removed after animation
Bug
19243980
Change-Id: Ic1d54f92051f7d937878898cae210ec18ecbaff8
Sunny Goyal [Wed, 11 Feb 2015 03:52:36 +0000 (19:52 -0800)]
Fixing rank migration code to handle null values correctly.
Bug:
19297508
Change-Id: I652ef30ab37f5b09204f0388de8e065d64b7724d
Sunny Goyal [Sat, 17 Jan 2015 00:14:29 +0000 (16:14 -0800)]
Launcher crashes on widget bind permission prompt
Change-Id: If09feb357e1604e5ee1a66305b022674f466833e
(cherry picked from commit
e6b63a3d7335fed5b7bbcc6d2c6230ae28facd3e)
Adam Cohen [Fri, 6 Feb 2015 23:29:32 +0000 (23:29 +0000)]
Merge "Revert "Adding Launcher3 callbacks for trimming memory."" into ub-launcher3-almonte
Adam Cohen [Fri, 6 Feb 2015 23:28:49 +0000 (23:28 +0000)]
Revert "Adding Launcher3 callbacks for trimming memory."
This reverts commit
42f3b9e0283c30c40c286f9958ce0f8b02f85c52.
Change-Id: I65a7c893576c0901b231bab9abe6937f99415f1e
Robert Kozikowski [Wed, 4 Feb 2015 18:38:30 +0000 (18:38 +0000)]
Merge "Adding Launcher3 callbacks for trimming memory." into ub-launcher3-almonte
Sunny Goyal [Wed, 4 Feb 2015 18:05:05 +0000 (10:05 -0800)]
Adding null-check before parsing an intent
Bug:
18962665
Change-Id: Iae02435f019fa205f3ee3ae721a29f26b3b56dd2
Robert Kozikowski [Wed, 4 Feb 2015 14:59:39 +0000 (14:59 +0000)]
Adding Launcher3 callbacks for trimming memory.
It will help reduce memory footprint of Launcher, when in background.
It is required to help deallocate images, when Google Now Launcher
goes into the background. See cl/
83222937/ .
Change-Id: I6d3d4d1f0457c67abcad3ba4516c87abcf666b05
Adam Cohen [Fri, 30 Jan 2015 18:28:23 +0000 (10:28 -0800)]
Fix ClassCastException due to typo
issue
19159790
Change-Id: I5f9fa0e3672c10a460606dcb13b158bd4e614813
Nilesh Agrawal [Mon, 26 Jan 2015 22:07:29 +0000 (14:07 -0800)]
Modify strict mode thread policy for LauncherProvider.
Allowing thread writes too as SQLiteOpenHelper.getWritableDatabase needs it.
Bug:
19094644
Change-Id: I39fe97a9e7fc07c38a4f8e5c5979196b742e36bf
Geoff Mendal [Mon, 26 Jan 2015 14:25:08 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0424587be34af78b7720a9a29d09b7e0ba129790
Auto-generated-cl: translation import
Sunny Goyal [Fri, 23 Jan 2015 21:45:20 +0000 (13:45 -0800)]
Adding support for <include> tag in AutoInstall layout
Bug:
19121893
Change-Id: I760fa76d6e63c1aa0152e8cd710aba0d6ef4462a
Adam Cohen [Fri, 23 Jan 2015 03:44:32 +0000 (19:44 -0800)]
Add project / classpath to gitignore
Change-Id: I157d480ebaa6d3873d03fd547fe4a8e4a4e9e015
Nilesh Agrawal [Wed, 21 Jan 2015 19:50:57 +0000 (11:50 -0800)]
Add strict mode exception in LauncherProvider.
Content providers are created during process startup (before Application.onCreate),
and we should not be doing expensive stuff in Provider.onCreate
Adding an exception for now as it looks like LauncherProvider initialization is needed
before we can show meaningful UI.
Bug:
19094644
Change-Id: I860c2934c110d3a43f1a3afa00729077dc64796c
Geoff Mendal [Wed, 21 Jan 2015 16:02:36 +0000 (08:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I56a37f9442adf586d40bfbb2b41b22ccf2052f51
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Jan 2015 18:34:06 +0000 (10:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5435a134c4c9ebd14acf9cca343e71b06fd72758
Auto-generated-cl: translation import
Sunny Goyal [Sat, 17 Jan 2015 01:58:01 +0000 (01:58 +0000)]
Merge "Adding accessibility controls" into ub-launcher3-almonte
Sunny Goyal [Sat, 17 Jan 2015 01:56:11 +0000 (01:56 +0000)]
Merge "Avoiding writing the Metadata in the backup if nothing was changed in the backup" into ub-launcher3-almonte
Sunny Goyal [Fri, 9 Jan 2015 00:59:04 +0000 (16:59 -0800)]
Adding accessibility controls
> Adding 'Remove' option to workspace items
> Adding 'Add to workspace' to all apps and widget list items, which
adds the item to the first available space, giving preference to
the current workspace screen
> Adding 'App info' and 'Uninstall' options to appropriate items
Bug:
18482913
Change-Id: Ifab7423af2d9ba502b5a2771b37bb5436b3df937
Geoff Mendal [Sat, 17 Jan 2015 00:07:34 +0000 (16:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I49acadd887529f73104e7f612be9a54f7689dd97
Auto-generated-cl: translation import
Sunny Goyal [Fri, 16 Jan 2015 22:10:32 +0000 (14:10 -0800)]
Avoiding writing the Metadata in the backup if nothing was changed in the backup
Change-Id: I4608ab5511b01f0d0018596d68e4341635649f73
Sunny Goyal [Mon, 5 Jan 2015 21:41:43 +0000 (13:41 -0800)]
Adding a rank column for itemInfo
> Rank is used to determine position of an item
in a folder.
Bug:
18590192
Change-Id: I2826a7c570b4cc58e719d685f17a24ec6133804f
Sunny Goyal [Sat, 22 Nov 2014 06:42:53 +0000 (22:42 -0800)]
Removing dead code from Launcher provider
> Removing DB upgrade logic for versions before 12. Launcher3
was forked off Launcher2 when DB version was already 12, so, there
can never be a lower version of the DB.
> Removing logic for auto import of launcher2 DB. This flow had
been permanently disabled by a flag, and we show a confirmation
prompt/cling before migration
Change-Id: I2ac2f21fefc41ee247164566a088927263b09459
Dave Hawkey [Fri, 19 Dec 2014 21:13:30 +0000 (14:13 -0700)]
Add syntax option to backup.proto.
This is required to properly compile the file in google3.
Change-Id: Ib9ff3163974a5180797c0ecadb833dae93619b2c
Brian Parfett [Fri, 12 Dec 2014 20:30:00 +0000 (12:30 -0800)]
Updating version codes from L to LOLLIPOP
This is required so Launcher3 can compile within IntelliJ.
Change-Id: I99a98a6d2326a8f8b0f0320430de9b555ea430c6
Bugs: b/
18720914
Geoff Mendal [Wed, 10 Dec 2014 15:43:52 +0000 (07:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id66a36209915e770779ef3c41cf18135c5180ac3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 8 Dec 2014 19:15:42 +0000 (11:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3eb761fffcf27ceb4d79749da589dbaa9e7b9444
Auto-generated-cl: translation import
Adam Cohen [Sat, 6 Dec 2014 00:22:42 +0000 (00:22 +0000)]
Merge "Supporting custom widgets provided by launcher" into ub-now-master
Adam Cohen [Thu, 6 Mar 2014 02:07:04 +0000 (18:07 -0800)]
Supporting custom widgets provided by launcher
-> This change provides integration for widgets provided by
the launcher package which can run arbitrary code.
Change-Id: I6052da5c4afed7ee72e3b44d045b9c46f2d84c42
Adam Cohen [Thu, 4 Dec 2014 18:43:49 +0000 (18:43 +0000)]
am
02509457: Avoid db exception on L and above
* commit '
0250945759f7ac58aab912448d62dc108b1770c5':
Avoid db exception on L and above
Adam Cohen [Thu, 4 Dec 2014 18:34:57 +0000 (10:34 -0800)]
Avoid db exception on L and above
Bug
18554839
Change-Id: I43f391b7cc376f697ce7b5b363e8be3aa85814b5
Adam Cohen [Thu, 4 Dec 2014 18:24:26 +0000 (18:24 +0000)]
am
2975e341: (-s ours) am
d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
* commit '
2975e34145b38e44dc8a7def2617e3fe0d15321d':
Ignoring specific db exception DO NOT MERGE
Adam Cohen [Thu, 4 Dec 2014 18:17:52 +0000 (18:17 +0000)]
am
d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
* commit '
d2285942dde8f2633f1d79abc01e598da7925090':
Ignoring specific db exception DO NOT MERGE
Adam Cohen [Thu, 4 Dec 2014 18:14:22 +0000 (18:14 +0000)]
Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
Winson Chung [Mon, 1 Dec 2014 23:05:17 +0000 (15:05 -0800)]
Ignoring specific db exception DO NOT MERGE
Bug
18554839.
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
(cherry picked from commit
5f05913f71da68a6c406f905ec6979586e3ba27a)
Adam Cohen [Thu, 4 Dec 2014 17:37:27 +0000 (17:37 +0000)]
am
e6673dc1: am
268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete
* commit '
e6673dc1fa94945925f4097f88dc2f5264c4316d':
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Adam Cohen [Thu, 4 Dec 2014 17:34:10 +0000 (17:34 +0000)]
am
268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete
* commit '
268b8907d1f2fcf9775880c69899b3c6fbe85ea3':
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Adam Cohen [Tue, 2 Dec 2014 23:24:52 +0000 (15:24 -0800)]
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Bug:
18567716
Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
(cherry picked from commit
5c18b80ed9aaa57b27b56667e3699fd76bcce8ed)
Geoff Mendal [Thu, 4 Dec 2014 15:15:45 +0000 (15:15 +0000)]
am
2f805f0d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens
* commit '
2f805f0d00b6521d6f6be25b615b3aff1b8f621d':
Import translations. DO NOT MERGE
Sunny Goyal [Thu, 4 Dec 2014 15:15:44 +0000 (15:15 +0000)]
am
f2048779: Fixing wrong package check when adding shortcuts
* commit '
f2048779990bfd3c20b52149f5e8ab208bf2502a':
Fixing wrong package check when adding shortcuts
Geoff Mendal [Thu, 4 Dec 2014 05:28:01 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-queens
Geoff Mendal [Wed, 3 Dec 2014 19:01:37 +0000 (11:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: If32589149a2b776b668510662360e04aa66ade88
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Dec 2014 19:00:59 +0000 (11:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I417c78f889994b02bff33793c866af0a1b13d47f
Auto-generated-cl: translation import
Sunny Goyal [Wed, 3 Dec 2014 08:55:16 +0000 (14:25 +0530)]
Fixing wrong package check when adding shortcuts
Bug:
18571789,
18535867
Change-Id: I2544fa634879846d812b00f8649520400f66d29e
Adam Cohen [Tue, 2 Dec 2014 23:55:48 +0000 (23:55 +0000)]
am
5c18b80e: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete
* commit '
5c18b80ed9aaa57b27b56667e3699fd76bcce8ed':
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Adam Cohen [Tue, 2 Dec 2014 23:24:52 +0000 (15:24 -0800)]
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Bug:
18567716
Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
Winson Chung [Tue, 2 Dec 2014 00:35:51 +0000 (00:35 +0000)]
am
1c96028f: Merge "Ignoring specific db exception to workaround Bug.
18554839." into ub-now-queens
* commit '
1c96028f414f904b90c1a180a537021a6a3eceff':
Ignoring specific db exception to workaround Bug.
18554839.
Winson Chung [Tue, 2 Dec 2014 00:30:45 +0000 (00:30 +0000)]
Merge "Ignoring specific db exception to workaround Bug.
18554839." into ub-now-queens
Winson Chung [Mon, 1 Dec 2014 23:05:17 +0000 (15:05 -0800)]
Ignoring specific db exception to workaround Bug.
18554839.
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
Chris Wren [Tue, 25 Nov 2014 15:12:13 +0000 (15:12 +0000)]
am
b02e611d: Don\'t try to create an app state instance during restore.
* commit '
b02e611d15bd6fbb05814adaa804dd68181c556c':
Don't try to create an app state instance during restore.
Chris Wren [Mon, 24 Nov 2014 21:57:54 +0000 (16:57 -0500)]
Don't try to create an app state instance during restore.
Added a static utility function to get the DeviceProfile instead.
Bug:
18504164
Change-Id: Ia510a84f1c195e58acf3bf4d1f6a42c739fdd413
Geoff Mendal [Mon, 24 Nov 2014 15:34:02 +0000 (15:34 +0000)]
am
ab6527da: (-s ours) Import translations. DO NOT MERGE
* commit '
ab6527da412bf944df08429c697f5fcf94f8bb52':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 14:21:53 +0000 (06:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0d7a075387e2ba2c8b9607620ae1d1197cf5cd99
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 14:21:29 +0000 (06:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib839840795a9298d8539b040c5a67366398ed663
Auto-generated-cl: translation import
Sunny Goyal [Fri, 21 Nov 2014 02:19:26 +0000 (02:19 +0000)]
am
3da888d1: Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens
* commit '
3da888d17c020b39ba36dbc99b681bf3339d269f':
Disabling auto addition of managed profile shortcuts
Sunny Goyal [Fri, 21 Nov 2014 02:10:07 +0000 (02:10 +0000)]
Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens
Sunny Goyal [Fri, 21 Nov 2014 01:01:00 +0000 (17:01 -0800)]
Disabling auto addition of managed profile shortcuts
Bug:
16188104
Change-Id: Ib6464c22140df6d60112eb35f5983718b3db6288
Adam Cohen [Thu, 20 Nov 2014 23:45:51 +0000 (23:45 +0000)]
am
c254da26: Updating default page indicator asset
* commit '
c254da26a607bb0af01915ef441c40dac25ffa09':
Updating default page indicator asset
Adam Cohen [Thu, 20 Nov 2014 22:27:27 +0000 (14:27 -0800)]
Updating default page indicator asset
Change-Id: If1be59c8c6590125c2347ba2928f61522f15f959
Adam Cohen [Thu, 20 Nov 2014 14:45:11 +0000 (14:45 +0000)]
am
c8f4e1bc: Fix a couple regressions from resetting AppsCustomizeTabHost
* commit '
c8f4e1bc88401cad3cc5e439cd08450974d99d81':
Fix a couple regressions from resetting AppsCustomizeTabHost
Adam Cohen [Thu, 20 Nov 2014 00:03:20 +0000 (16:03 -0800)]
Fix a couple regressions from resetting AppsCustomizeTabHost
Bug
18409435
Bug
18358080
Change-Id: I07a071342b5c5e062ab2bb562b672d93ba0d5c2e
Adam Cohen [Wed, 19 Nov 2014 19:20:24 +0000 (19:20 +0000)]
am
08072c05: Prevent multiple workspace state animators from being started
* commit '
08072c05bf9c760acff653545a795a0fae4bd917':
Prevent multiple workspace state animators from being started
Adam Cohen [Wed, 19 Nov 2014 01:53:44 +0000 (17:53 -0800)]
Prevent multiple workspace state animators from being started
-> Probably an issue with the way we're wrapping ViewPropertyAnimator
which can lead to us acting like it's valid to have multiple
instances of a VPA. In reality I think this is very problematic.
-> For now, we can just make sure the previous animation is canceled
if it hasn't yet completed.
Bug
18428886
Change-Id: I097eec08ec68ed098e68866fb5eda72734c51b00
Adam Cohen [Wed, 19 Nov 2014 00:39:22 +0000 (00:39 +0000)]
am
7c39e238: Merge "Clearing DB before restore starts." into ub-now-queens
* commit '
7c39e2380f3406f897b2f0abffcb8267d2212482':
Clearing DB before restore starts.
Adam Cohen [Tue, 18 Nov 2014 23:34:06 +0000 (23:34 +0000)]
am
c7cd2cb2: Add callback which got missed in refactor
* commit '
c7cd2cb28f0d08dd47c79007794fc37036210b6a':
Add callback which got missed in refactor
Adam Cohen [Tue, 18 Nov 2014 20:05:07 +0000 (20:05 +0000)]
Merge "Clearing DB before restore starts." into ub-now-queens
Sunny Goyal [Tue, 18 Nov 2014 18:38:22 +0000 (10:38 -0800)]
Clearing DB before restore starts.
Bug:
18362052
Change-Id: Ic4faf04db2f76c0c434907f1c41c8b708283eeb7
Adam Cohen [Tue, 18 Nov 2014 01:45:34 +0000 (17:45 -0800)]
Add callback which got missed in refactor
Bug
18418855
Change-Id: Ia3a1cec76721bbbc118dd7389b5e960802a64b88
Geoff Mendal [Mon, 17 Nov 2014 18:38:37 +0000 (18:38 +0000)]
am
0e974b4d: (-s ours) Import translations. DO NOT MERGE
* commit '
0e974b4d4480242c768cbd886d02ea66c0c8643d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Nov 2014 18:27:36 +0000 (10:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I79e98ec8bcc48f2c49e648e769fb1ff4d2f993d9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 17 Nov 2014 18:26:59 +0000 (10:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia5e4b798ca68ced4d2b61d2d5d84d50f98b7bdff
Auto-generated-cl: translation import
Sunny Goyal [Fri, 14 Nov 2014 21:21:23 +0000 (21:21 +0000)]
am
416541cc: Adding a few null checks. 1) During migration, if launcher2 has deleted user data, migration oes not happen 2) If Launcher3 does not has bind widget permission, QSB would be null.
* commit '
416541cc0e03ccd919d5669f0d06ef42a3b7ff21':
Adding a few null checks. 1) During migration, if launcher2 has deleted user data, migration oes not happen 2) If Launcher3 does not has bind widget permission, QSB would be null.
Sunny Goyal [Fri, 14 Nov 2014 19:59:57 +0000 (11:59 -0800)]
Adding a few null checks.
1) During migration, if launcher2 has deleted user data,
migration oes not happen
2) If Launcher3 does not has bind widget permission,
QSB would be null.
Bug:
18388507
Change-Id: Ief81f6f77ce154e7b3ecd4b77caf24239401e738
Sunny Goyal [Fri, 14 Nov 2014 19:08:50 +0000 (19:08 +0000)]
am
06910a88: Fixing NullPointer Exception when user is deleted.
* commit '
06910a88445c46fb95c9ad5ff83793e37b6af692':
Fixing NullPointer Exception when user is deleted.
Sunny Goyal [Fri, 14 Nov 2014 18:14:18 +0000 (10:14 -0800)]
Fixing NullPointer Exception when user is deleted.
Bug:
18388507
Change-Id: I4176ea37a019c2a862e6b2875cc6b03ec9118571
Sunny Goyal [Wed, 12 Nov 2014 22:36:26 +0000 (22:36 +0000)]
am
e0f58d73: Adding shortcuts corresponding to ManagedUsers automatically.
* commit '
e0f58d73646871497596fb8f7321d407e7565c28':
Adding shortcuts corresponding to ManagedUsers automatically.
Sunny Goyal [Tue, 11 Nov 2014 02:05:31 +0000 (18:05 -0800)]
Adding shortcuts corresponding to ManagedUsers automatically.
Bug:
16188104
Change-Id: Ic07578dd187263f59f3c431cbb78dea90d0c24f4
Sunny Goyal [Wed, 12 Nov 2014 18:03:49 +0000 (18:03 +0000)]
am
b155bbb3: Merge "Using the default search widget in Launcher3" into ub-now-queens
* commit '
b155bbb375c6bfed14f79def122d69c7659434f7':
Using the default search widget in Launcher3
Sunny Goyal [Wed, 12 Nov 2014 18:00:23 +0000 (18:00 +0000)]
Merge "Using the default search widget in Launcher3" into ub-now-queens
Sunny Goyal [Wed, 12 Nov 2014 10:53:01 +0000 (10:53 +0000)]
am
bdc2b5f9: Merge "Removing some duplicate methods" into ub-now-queens
* commit '
bdc2b5f963a93bddade98daaf2a329c976b199e0':
Removing some duplicate methods
Sunny Goyal [Tue, 11 Nov 2014 22:55:05 +0000 (22:55 +0000)]
Merge "Removing some duplicate methods" into ub-now-queens
Sunny Goyal [Tue, 11 Nov 2014 20:23:59 +0000 (12:23 -0800)]
Removing some duplicate methods
Change-Id: I8a1295ab74890984e8d8508aaa18fd79ac2a032d