Made some temporary aesthetic improvements
- icons in the customization drawer are now much more tightly spaced, and no longer use the default gallery styling - wrapped some >100 char lines - removed "Applications" from the shortcuts customization drawer
This commit is contained in:
parent
79212d8136
commit
54f7ac30f2
|
@ -15,10 +15,10 @@
|
|||
-->
|
||||
|
||||
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:background="?android:attr/galleryItemBackground"
|
||||
android:layout_width="600dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="200dip"
|
||||
android:layout_height="200dip"
|
||||
android:padding="20dip"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal|center_vertical|clip_vertical"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="#ffffffff" />
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="600dip"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="20dip"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal|center_vertical|clip_vertical"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="#ffffffff" />
|
|
@ -778,12 +778,14 @@ public final class Launcher extends Activity
|
|||
widgetChooser.setLauncher(this);
|
||||
|
||||
FolderChooser folderChooser = (FolderChooser) findViewById(R.id.folder_chooser);
|
||||
IntentListAdapter folderTypes = new FolderListAdapter(this, LiveFolders.ACTION_CREATE_LIVE_FOLDER);
|
||||
IntentListAdapter folderTypes = new FolderListAdapter(
|
||||
this, LiveFolders.ACTION_CREATE_LIVE_FOLDER);
|
||||
folderChooser.setAdapter(folderTypes);
|
||||
folderChooser.setLauncher(this);
|
||||
|
||||
ShortcutChooser shortcutChooser = (ShortcutChooser) findViewById(R.id.shortcut_chooser);
|
||||
IntentListAdapter shortcutTypes = new ShortcutListAdapter(this, Intent.ACTION_CREATE_SHORTCUT);
|
||||
IntentListAdapter shortcutTypes = new IntentListAdapter(
|
||||
this, Intent.ACTION_CREATE_SHORTCUT);
|
||||
shortcutChooser.setAdapter(shortcutTypes);
|
||||
shortcutChooser.setLauncher(this);
|
||||
} else {
|
||||
|
@ -813,7 +815,12 @@ public final class Launcher extends Activity
|
|||
|
||||
deleteZone.setLauncher(this);
|
||||
deleteZone.setDragController(dragController);
|
||||
int deleteZoneHandleId = LauncherApplication.isScreenXLarge() ? R.id.add_button : R.id.all_apps_button_cluster;
|
||||
int deleteZoneHandleId;
|
||||
if (LauncherApplication.isScreenXLarge()) {
|
||||
deleteZoneHandleId = R.id.add_button;
|
||||
} else {
|
||||
deleteZoneHandleId = R.id.all_apps_button_cluster;
|
||||
}
|
||||
deleteZone.setHandle(findViewById(deleteZoneHandleId));
|
||||
|
||||
dragController.setDragScoller(workspace);
|
||||
|
@ -2121,7 +2128,8 @@ public final class Launcher extends Activity
|
|||
}
|
||||
|
||||
private boolean isCustomizationDrawerVisible() {
|
||||
return mHomeCustomizationDrawer != null && mHomeCustomizationDrawer.getVisibility() == View.VISIBLE;
|
||||
return mHomeCustomizationDrawer != null &&
|
||||
mHomeCustomizationDrawer.getVisibility() == View.VISIBLE;
|
||||
}
|
||||
|
||||
private void showCustomizationDrawer() {
|
||||
|
@ -2130,12 +2138,14 @@ public final class Launcher extends Activity
|
|||
closeAllApps(false);
|
||||
}
|
||||
mHomeCustomizationDrawer.setVisibility(View.VISIBLE);
|
||||
mHomeCustomizationDrawer.startAnimation(AnimationUtils.loadAnimation(this, R.anim.home_customization_drawer_slide_up));
|
||||
mHomeCustomizationDrawer.startAnimation(
|
||||
AnimationUtils.loadAnimation(this, R.anim.home_customization_drawer_slide_up));
|
||||
}
|
||||
|
||||
private void hideCustomizationDrawer() {
|
||||
if (isCustomizationDrawerVisible()) {
|
||||
Animation slideDownAnimation = AnimationUtils.loadAnimation(this, R.anim.home_customization_drawer_slide_down);
|
||||
Animation slideDownAnimation = AnimationUtils.loadAnimation(
|
||||
this, R.anim.home_customization_drawer_slide_down);
|
||||
slideDownAnimation.setAnimationListener(new Animation.AnimationListener() {
|
||||
public void onAnimationEnd(Animation animation) {
|
||||
mHomeCustomizationDrawer.setVisibility(View.GONE);
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
package com.android.launcher2;
|
||||
|
||||
import com.android.launcher.R;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.Intent.ShortcutIconResource;
|
||||
import android.content.pm.ResolveInfo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
||||
public class ShortcutListAdapter extends IntentListAdapter {
|
||||
|
||||
public ShortcutListAdapter(Context context, String actionFilter) {
|
||||
super(context, actionFilter);
|
||||
|
||||
// Manually create a separate entry for creating an Application shortcut
|
||||
ResolveInfo folder = new ResolveInfo();
|
||||
|
||||
folder.icon = R.drawable.ic_launcher_application;
|
||||
folder.labelRes = R.string.group_applications;
|
||||
folder.resolvePackageName = context.getPackageName();
|
||||
mIntentList.add(0, folder);
|
||||
}
|
||||
}
|
|
@ -73,7 +73,7 @@ public class WidgetListAdapter extends BaseAdapter {
|
|||
LayoutInflater inflater =
|
||||
(LayoutInflater)mLauncher.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
textView = (TextView) inflater.inflate(
|
||||
R.layout.home_customization_drawer_item, parent, false);
|
||||
R.layout.home_customization_drawer_widget, parent, false);
|
||||
} else {
|
||||
textView = (TextView) convertView;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue