openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Removing some obsolete files" into ub-launcher3-burnaby-polish

This commit is contained in:
Sunny Goyal 2016-01-19 20:54:00 +00:00 committed by Android (Google) Code Review
parent c7a49f0574 2080603ca7
commit b56090af35
3 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/config.xml
View File

@ -71,10 +71,6 @@
filter the activities shown in the launcher. Can be empty. -->
<string name="app_filter_class" translatable="false"></string>
<!-- Name of a subclass of com.android.launcher3.BuildInfo used to
get build information. Can be empty. -->
<string name="build_info_class" translatable="false"></string>
<!-- View ID to use for QSB widget -->
<item type="id" name="qsb_widget" />

32
src/com/android/launcher3/BuildInfo.java
View File

@ -1,32 +0,0 @@
package com.android.launcher3;
import android.text.TextUtils;
import android.util.Log;
public class BuildInfo {
private static final boolean DBG = false;
private static final String TAG = "BuildInfo";
public boolean isDogfoodBuild() {
return false;
}
public static BuildInfo loadByName(String className) {
if (TextUtils.isEmpty(className)) return new BuildInfo();
if (DBG) Log.d(TAG, "Loading BuildInfo: " + className);
try {
Class<?> cls = Class.forName(className);
return (BuildInfo) cls.newInstance();
} catch (ClassNotFoundException e) {
Log.e(TAG, "Bad BuildInfo class", e);
} catch (InstantiationException e) {
Log.e(TAG, "Bad BuildInfo class", e);
} catch (IllegalAccessException e) {
Log.e(TAG, "Bad BuildInfo class", e);
} catch (ClassCastException e) {
Log.e(TAG, "Bad BuildInfo class", e);
}
return new BuildInfo();
}
}

6
src/com/android/launcher3/LauncherAppState.java
View File

@ -20,13 +20,13 @@ import android.app.SearchManager;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.UserManager;
import android.util.Log;
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.PackageInstallerCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.util.ConfigMonitor;
import com.android.launcher3.util.TestingUtils;
import com.android.launcher3.util.Thunk;
@ -36,7 +36,6 @@ import java.lang.ref.WeakReference;
public class LauncherAppState {
private final AppFilter mAppFilter;
private final BuildInfo mBuildInfo;
@Thunk final LauncherModel mModel;
private final IconCache mIconCache;
private final WidgetPreviewLoader mWidgetCache;
@ -90,7 +89,6 @@ public class LauncherAppState {
mWidgetCache = new WidgetPreviewLoader(sContext, mIconCache);
mAppFilter = AppFilter.loadByName(sContext.getString(R.string.app_filter_class));
mBuildInfo = BuildInfo.loadByName(sContext.getString(R.string.build_info_class));
mModel = new LauncherModel(this, mIconCache, mAppFilter);
LauncherAppsCompat.getInstance(sContext).addOnAppsChangedCallback(mModel);
@ -174,6 +172,6 @@ public class LauncherAppState {
}
public static boolean isDogfoodBuild() {
return getInstance().mBuildInfo.isDogfoodBuild();
return FeatureFlags.IS_ALPHA_BUILD || FeatureFlags.IS_DEV_BUILD;
}
}