OSDN Git Service
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
Sunny Goyal [Tue, 11 Nov 2014 00:01:44 +0000 (16:01 -0800)]
Proguard changing methods required for click feedback aniamtion
Bug:
18323452
Change-Id: Iac6d75a3c46c3a4c2a74af43bd1fca738235c2d5
Sunny Goyal [Fri, 24 Oct 2014 23:26:52 +0000 (16:26 -0700)]
Adding some spacing between overview panel items
Bug:
18293488
Change-Id: I8731c4d2ad34571a4a3a21b03a5fbae0ba66332f
Sunny Goyal [Wed, 5 Nov 2014 23:23:59 +0000 (23:23 +0000)]
Merge "Using a proxy call for isAttachedToWindow for pre 19 devices" into ub-now-queens
Sunny Goyal [Mon, 3 Nov 2014 19:30:01 +0000 (11:30 -0800)]
Using a proxy call for isAttachedToWindow for pre 19 devices
Bug:
17423114
Change-Id: I6f0cc306b7fcc8087b4e4fc92bb8796d51a989d6
Sunny Goyal [Wed, 5 Nov 2014 23:13:08 +0000 (23:13 +0000)]
Merge "Clearing some android list errors/warnings." into ub-now-queens
Sunny Goyal [Wed, 5 Nov 2014 18:58:16 +0000 (18:58 +0000)]
Merge "Removing InstallWidgetReceiver related obsolete code." into ub-now-queens
Sunny Goyal [Wed, 5 Nov 2014 18:34:43 +0000 (10:34 -0800)]
Removing InstallWidgetReceiver related obsolete code.
Change-Id: I61700b363f8af6434e750bcb5323e0ad4e5bf011
Adam Cohen [Tue, 4 Nov 2014 00:24:38 +0000 (00:24 +0000)]
Merge "Updating page indicator assets" into ub-now-queens
Adam Cohen [Tue, 4 Nov 2014 00:13:45 +0000 (16:13 -0800)]
Updating page indicator assets
Bug:
17318376
Change-Id: I4e73bf4892575bbb31f28d2cf1a4e476f8895dfa
Sunny Goyal [Mon, 3 Nov 2014 20:11:05 +0000 (20:11 +0000)]
Merge "Moving methods which update internal sets on a separate thread" into ub-now-queens
Sunny Goyal [Mon, 3 Nov 2014 19:39:27 +0000 (11:39 -0800)]
Clearing some android list errors/warnings.
Change-Id: I2f1f991e61f9e41644ee9943f5a1a15971cca6c1
Adam Cohen [Fri, 31 Oct 2014 23:58:00 +0000 (16:58 -0700)]
Fix folder hint text color. Likely a regression from upgrading the Activity theme
Bug:
18204650
Change-Id: I5e23df5f4f8f1f8ca7a22c8a62797e77c9a4a9e1
Adam Cohen [Fri, 31 Oct 2014 23:15:36 +0000 (16:15 -0700)]
Overlay shouldn't show up above Intro screen
bug:
18173340
Change-Id: Icf738a55398023ab6bad5cced05b25e053dec0a2
Adam Cohen [Fri, 31 Oct 2014 18:48:25 +0000 (11:48 -0700)]
Adding a couple memory optimizations to Launcher
-> Always dispose of widget page views when leaving the activity.
These pages hold onto many bitmaps.
-> Clear database cache when leaving the activity.
Bug:
17967108
Change-Id: I10ebaaed14e7cd86f09a9afcabd73043705f21b8
Sunny Goyal [Thu, 30 Oct 2014 17:16:49 +0000 (10:16 -0700)]
Moving methods which update internal sets on a separate thread
Bug:
18152117
Change-Id: I5fccd203b5fe65e79dcc5aead6cb1cb6c3b622fe
Sunny Goyal [Wed, 29 Oct 2014 17:51:54 +0000 (10:51 -0700)]
Failing restore, if we have an item outside screen bounds
Bug:
17552590
Change-Id: I2d25847fd05d9579bc29ccbfa62e34809d4855d1
Sunny Goyal [Wed, 29 Oct 2014 17:19:23 +0000 (17:19 +0000)]
Merge "Updating backup restore logic" into ub-now-queens
Sunny Goyal [Tue, 28 Oct 2014 23:37:10 +0000 (23:37 +0000)]
Merge "Fixing insets of launcher clings" into ub-now-queens
Sunny Goyal [Tue, 28 Oct 2014 23:30:20 +0000 (16:30 -0700)]
Fixing insets of launcher clings
Change-Id: Idbf46680f96086c93d667c26dc9ed214eeaf835e
Adam Cohen [Tue, 28 Oct 2014 23:16:02 +0000 (16:16 -0700)]
Make sure DragLayer layout params are of the correct type
bug
18141419
Change-Id: I50695a62cf9e1f25c054ac2c7197cd056d54cfae
Sunny Goyal [Thu, 16 Oct 2014 16:24:19 +0000 (09:24 -0700)]
Updating backup restore logic
> Adding DeviceProfile information in the backup
> Removing SharedPreference backup
> Adding helper methods to abort backup in the middle
> Comparing keys against the backup journal during restore
to avoid restoring corrupt/lost entries
> Old backups are still compatible, but lost keys verification
will be ignored in that case.
Bug:
17937935
Bug:
17951775
Bug:
17260941
Change-Id: Iad48646cfdd69abaff5c163b2055f3b8a9b39b19
Sunny Goyal [Tue, 28 Oct 2014 00:15:42 +0000 (00:15 +0000)]
Merge "Loading internal default layout if partner layout fails to load" into ub-now-queens
Sunny Goyal [Mon, 27 Oct 2014 23:29:51 +0000 (23:29 +0000)]
Merge "Removing landscape string overrides" into ub-now-queens
Sunny Goyal [Thu, 23 Oct 2014 21:21:02 +0000 (14:21 -0700)]
Loading internal default layout if partner layout fails to load
Bug:
18033885
Change-Id: I8399d0107cc3570c0e03d833601abf2cd194b3d3
Geoff Mendal [Mon, 27 Oct 2014 18:20:20 +0000 (18:20 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-queens
Geoff Mendal [Mon, 27 Oct 2014 18:07:51 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iff6f42e2460ae8c08dda9170361be3f010f32b48
Auto-generated-cl: translation import
Adam Cohen [Sat, 25 Oct 2014 00:40:34 +0000 (17:40 -0700)]
Fix edge case where LauncherOverlay scroll woudln't be reset
-> If the Workspace has a single page and the user goes from overscrolling
in one direction, and then the other, the LauncherOverlay scroll wouldn't
be set to 0 until the scrolling settled
Change-Id: I29ee9abdfa023ae3599d1590cdaebf457e2220fa
Adam Cohen [Fri, 24 Oct 2014 23:45:59 +0000 (16:45 -0700)]
Add InsettableFrameLayout layout params to easily ignore insets
Change-Id: I117fc34627e24ea5f909c3c87e9c2dbca46babb6
Adam Cohen [Fri, 24 Oct 2014 20:50:20 +0000 (13:50 -0700)]
Tweaking close AllApps / Widgets on KK and below
Bug:
17956862
Change-Id: I83b8973b7e98c1c3660221ac65dcb9ca8b4c84fd
Adam Cohen [Fri, 24 Oct 2014 19:52:49 +0000 (19:52 +0000)]
Merge "Was seeing some duplicated icons in the migration flow" into ub-now-queens
Adam Cohen [Fri, 24 Oct 2014 19:20:20 +0000 (12:20 -0700)]
Was seeing some duplicated icons in the migration flow
-> The only delta between the two icons was slightly different flags
-> No need to consider flags for the purposes of duplication
Change-Id: I161f6ad6023d829e5ebbb15f1a9fbc9306795d80
Adam Cohen [Fri, 24 Oct 2014 19:05:15 +0000 (19:05 +0000)]
Merge "Allow LauncherOverlay to access and manage insets" into ub-now-queens
Adam Cohen [Fri, 24 Oct 2014 00:28:30 +0000 (17:28 -0700)]
Allow LauncherOverlay to access and manage insets
Change-Id: Ib9faf37eb22ad2a0b18c076978ec9f2fd8864c0c
Sunny Goyal [Thu, 23 Oct 2014 20:57:41 +0000 (13:57 -0700)]
Disabling restore for below L devices
Change-Id: I262f52e88421637e0d50c048f6d53c6b5754da4e
Sunny Goyal [Thu, 23 Oct 2014 20:29:06 +0000 (20:29 +0000)]
Merge "Some resource fixes for drop target" into ub-now-queens
Sunny Goyal [Thu, 23 Oct 2014 18:38:15 +0000 (11:38 -0700)]
Some resource fixes for drop target
> Making it singleline with ellipsis everywhere
> Decreasing the text size on smaller devices
> Decreasing char limit for various labels
Bug:
17563793
Bug:
17938450
Change-Id: I8ad1a156de0601d07419b2cc6418389bc2e24a4e
Sunny Goyal [Thu, 23 Oct 2014 18:09:18 +0000 (11:09 -0700)]
Removing landscape string overrides
Change-Id: Idbfc600dfb32b195726f1b035d18be92c26883fd
Sunny Goyal [Wed, 22 Oct 2014 18:28:28 +0000 (11:28 -0700)]
Refactoring LauncherBackupHelper.java
> Moving a bunch of variables to Global level to make it easier
to maintain state.
Change-Id: I9ded313bd4f673f45c61556b8c66607dc78a5ae9
Sunny Goyal [Thu, 23 Oct 2014 16:53:44 +0000 (16:53 +0000)]
Merge "Deleting workspace items from db which have an invalid placement" into ub-now-queens
Sunny Goyal [Thu, 23 Oct 2014 16:52:30 +0000 (16:52 +0000)]
Merge "Removing AccessibleTabView and some other dead code." into ub-now-queens
Adam Cohen [Thu, 23 Oct 2014 00:41:58 +0000 (00:41 +0000)]
Merge "First pass of the Launcher Overlay interface / impl" into ub-now-queens
Adam Cohen [Thu, 16 Oct 2014 16:49:24 +0000 (09:49 -0700)]
First pass of the Launcher Overlay interface / impl
-> Added simple reference launcher extension
-> Make launcher able to handle a null qsb
Change-Id: Ib1575243cac800a335e95bbf00cdc394bb4741c3
Geoff Mendal [Wed, 22 Oct 2014 20:02:16 +0000 (13:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I289d8bb325fa4037936a57c7dfe908186e077be1
Auto-generated-cl: translation import
Sunny Goyal [Tue, 21 Oct 2014 18:30:20 +0000 (18:30 +0000)]
Merge "Updating ItemInfo objects in the worker thread" into ub-now-queens
Adam Cohen [Tue, 21 Oct 2014 18:11:34 +0000 (18:11 +0000)]
Merge "Not opening all apps again when AppInfo or Uninstall is selected" into ub-now-queens
Sunny Goyal [Tue, 21 Oct 2014 17:04:54 +0000 (10:04 -0700)]
Removing AccessibleTabView and some other dead code.
Change-Id: Ia122a6277f924e6077dbf15a4dc40b5042aa987d
Geoff Mendal [Mon, 20 Oct 2014 23:56:46 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-queens
Geoff Mendal [Mon, 20 Oct 2014 23:46:58 +0000 (16:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icd10604229b51f3870b346280be11cce2e9f8eeb
Auto-generated-cl: translation import
Sunny Goyal [Mon, 20 Oct 2014 20:41:47 +0000 (20:41 +0000)]
Merge "Showing widgets in a disabled state, when running in safe mode" into ub-now-queens
Sunny Goyal [Mon, 20 Oct 2014 20:35:32 +0000 (20:35 +0000)]
Merge "Using LinearLayout for overview panel" into ub-now-queens
Sunny Goyal [Wed, 1 Oct 2014 22:33:41 +0000 (15:33 -0700)]
Refactoring layout parsing code
Change-Id: Iee5b2280cb1e841bcfe91fdcf523de6fa7f7f3b8
Adam Cohen [Fri, 17 Oct 2014 16:30:00 +0000 (16:30 +0000)]
Merge "Adding ability to list folder items in separate file" into ub-now-queens
Sunny Goyal [Fri, 17 Oct 2014 03:12:06 +0000 (03:12 +0000)]
Merge "Removing all traces of Market button and TabIndicator" into ub-now-queens
Sunny Goyal [Thu, 16 Oct 2014 23:03:21 +0000 (16:03 -0700)]
Removing all traces of Market button and TabIndicator
Change-Id: I9dc10d990321697723560986834ebeef3e0f1c0d
Sunny Goyal [Fri, 17 Oct 2014 01:51:31 +0000 (01:51 +0000)]
Merge "Moving the focus indicator instantly to the target position, instead of begining the next animation from the middle." into ub-now-queens
Adam Cohen [Thu, 16 Oct 2014 16:49:52 +0000 (09:49 -0700)]
Adding ability to list folder items in separate file
-> remove all apps default layouts
Bug
17569015
Change-Id: I39b899b61d5b1cff2d7801d281dacfc804c403c5
Sunny Goyal [Thu, 16 Oct 2014 22:36:57 +0000 (15:36 -0700)]
Using LinearLayout for overview panel
> Using equal weight to ensure that all items are of same width
> The total width of the panel is set in DeviceProfile#layout
Bug:
17456856
Change-Id: Ic98f5c4f7befd4d32d1b52dfe8c9f5b6c58b020a
Sunny Goyal [Thu, 16 Oct 2014 21:07:29 +0000 (14:07 -0700)]
Fixing some IconCache methods not thread safe
Bug:
17981568
Change-Id: I0d49604c2e38bc9017cba527d87e24e8b086f1da
Sunny Goyal [Thu, 16 Oct 2014 19:18:37 +0000 (12:18 -0700)]
Deleting workspace items from db which have an invalid placement
Change-Id: I1d616e8cd533acd6ecd334d85e6468163f31f6a4
Sunny Goyal [Thu, 16 Oct 2014 19:08:41 +0000 (12:08 -0700)]
Not opening all apps again when AppInfo or Uninstall is selected
Bug:
17460202
Change-Id: Id67a9637324abceb5b446fff5999db2a0910401b
Sunny Goyal [Wed, 8 Oct 2014 17:47:28 +0000 (10:47 -0700)]
Showing widgets in a disabled state, when running in safe mode
Bug:
15172107
Change-Id: I7209836ca4ffacde7b7b232e230e9b9f1a0e54bb
Helena Josol [Thu, 16 Oct 2014 16:51:42 +0000 (16:51 +0000)]
Merge "Add more Launcher files to delete on Clear Launcher Data" into ub-now-queens
Helena Josol [Thu, 9 Oct 2014 16:04:09 +0000 (17:04 +0100)]
Add more Launcher files to delete on Clear Launcher Data
Bug:
12753154
Change-Id: I00679bdc6eff70a1398122aaa955c08eabd556b1
Adam Cohen [Wed, 15 Oct 2014 19:47:48 +0000 (19:47 +0000)]
Merge "Use LauncherCallbacks model instead of method overrides" into ub-now-queens
Sunny Goyal [Wed, 15 Oct 2014 19:40:31 +0000 (19:40 +0000)]
Merge "Adding NPE check in InstallShortcutReceiver" into ub-now-queens
Adam Cohen [Wed, 8 Oct 2014 01:14:53 +0000 (18:14 -0700)]
Use LauncherCallbacks model instead of method overrides
-> When extending the Launcher Activity, instead of overriding
public and protected methods, create a proper interface
-> This helps define the interface when extending Launcher
more formally and more clearly
Change-Id: Ib38e8a376b2242d4078bf6856bb145f5b5f0da80
Geoff Mendal [Wed, 15 Oct 2014 17:46:05 +0000 (10:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied5954dcd88f900ae2f9e21b1ec0cdbe01cad06b
Auto-generated-cl: translation import
Sunny Goyal [Tue, 14 Oct 2014 23:42:54 +0000 (16:42 -0700)]
Adding NPE check in InstallShortcutReceiver
> Removing some unused methods
Bug:
17971165
Change-Id: I1bc5c764fd65b44c950a58371b60d2b53c221995
Sunny Goyal [Tue, 14 Oct 2014 23:12:12 +0000 (16:12 -0700)]
Moving the focus indicator instantly to the target position, instead
of begining the next animation from the middle.
Bug:
17958897
Change-Id: Ie5a39b80ff9788edf368e0f4e23c07c2ed5b3d2c
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
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
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
Adam Cohen [Tue, 14 Oct 2014 22:09:00 +0000 (22:09 +0000)]
Merge "Fixing typo from previous CL" into ub-now-porkchop
Adam Cohen [Tue, 14 Oct 2014 22:04:34 +0000 (15:04 -0700)]
Fixing typo from previous CL
Bug
17969770
Change-Id: I4ea04864000d2ed8368ca81ba8cff42b4208d13d
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
Sunny Goyal [Mon, 13 Oct 2014 18:33:11 +0000 (11:33 -0700)]
Updating ItemInfo objects in the worker thread
> Launcher was making non-trivial updates to ItemInfo objects
on UI thread. These updates were getting skipped when the
Activity gets destroyed (possibly due to onConfigurationChange)
> Unregistering SessionCallback on application onTerminate,
rather than activity onDestroy
Bug:
17941096
Change-Id: Iad4a50871fe09470f26139b44a2e9886833032f1
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
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
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
Adam Cohen [Fri, 10 Oct 2014 01:43:18 +0000 (18:43 -0700)]
Removing some dead code
Change-Id: Idbd49302fc7123f72c7dad4c50612aaa662cca0d
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
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
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
Sunny Goyal [Wed, 8 Oct 2014 17:30:42 +0000 (17:30 +0000)]
Merge "Updating the wallpaperpicker thumb selection feedback" into ub-now-queens
Sunny Goyal [Wed, 8 Oct 2014 16:55:24 +0000 (09:55 -0700)]
Using DeviceDefault theme for Launcher and WallpaperPicker
Change-Id: I31bfeedd99d50683fba910f233b25bb3f364ce1f
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
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
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
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
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
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
Ian Parkinson [Mon, 6 Oct 2014 13:24:31 +0000 (14:24 +0100)]
Use View.generateViewId if available
Bug:
17456181
Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389
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
Adam Cohen [Fri, 3 Oct 2014 20:19:33 +0000 (13:19 -0700)]
Add missing xxhdpi asset
Bug:
17813013
Change-Id: If1e3448fb109e3f7f0c1ae6562a795fecf3bdf42
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.
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
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
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