diff options
author | Michael Jurka <mikejurka@google.com> | 2011-07-27 22:40:17 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2011-07-27 22:42:40 -0700 |
commit | 99633da90012dc732cbc12a96b33e17abcecb464 (patch) | |
tree | 4a0640212e41dbb6b312a15f0d5cd5eb715feedd /src/com/android/launcher2/Launcher.java | |
parent | aed8c8302a7fe2ed121a96ad1801a7da39f5af40 (diff) | |
download | packages_apps_trebuchet-99633da90012dc732cbc12a96b33e17abcecb464.zip packages_apps_trebuchet-99633da90012dc732cbc12a96b33e17abcecb464.tar.gz packages_apps_trebuchet-99633da90012dc732cbc12a96b33e17abcecb464.tar.bz2 |
Fix bug where Launcher would appear all black
Bug # 5033201
Change-Id: If88406fe1ad1d56469765d1783aeb6d73f28b192
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 0f302a0..1cf558b 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -212,12 +212,6 @@ public final class Launcher extends Activity private static HashMap<Long, FolderInfo> sFolders = new HashMap<Long, FolderInfo>(); - // Hotseats (quick-launch icons next to AllApps) - private String[] mHotseatConfig = null; - private Intent[] mHotseats = null; - private Drawable[] mHotseatIcons = null; - private CharSequence[] mHotseatLabels = null; - private Intent mAppMarketIntent = null; // Related to the auto-advancing of widgets @@ -436,16 +430,6 @@ public final class Launcher extends Activity } } - // Note: This doesn't do all the client-id magic that BrowserProvider does - // in Browser. (http://b/2425179) - private Uri getDefaultBrowserUri() { - String url = getString(R.string.default_browser_url); - if (url.indexOf("{CID}") != -1) { - url = url.replace("{CID}", "android-google"); - } - return Uri.parse(url); - } - /** * Returns whether we should delay spring loaded mode -- for shortcuts and widgets that have * a configuration step, this allows the proper animations to run after other transitions. @@ -1922,27 +1906,6 @@ public final class Launcher extends Activity showDialog(DIALOG_CREATE_SHORTCUT); } - private void pickShortcut() { - // Insert extra item to handle picking application - Bundle bundle = new Bundle(); - - ArrayList<String> shortcutNames = new ArrayList<String>(); - shortcutNames.add(getString(R.string.group_applications)); - bundle.putStringArrayList(Intent.EXTRA_SHORTCUT_NAME, shortcutNames); - - ArrayList<ShortcutIconResource> shortcutIcons = new ArrayList<ShortcutIconResource>(); - shortcutIcons.add(ShortcutIconResource.fromContext(Launcher.this, - R.drawable.ic_launcher_application)); - bundle.putParcelableArrayList(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, shortcutIcons); - - Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY); - pickIntent.putExtra(Intent.EXTRA_INTENT, new Intent(Intent.ACTION_CREATE_SHORTCUT)); - pickIntent.putExtra(Intent.EXTRA_TITLE, getText(R.string.title_select_shortcut)); - pickIntent.putExtras(bundle); - - startActivityForResult(pickIntent, REQUEST_PICK_SHORTCUT); - } - private class RenameFolder { private EditText mInput; |