summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout-land/hotseat.xml1
-rw-r--r--res/layout-port/hotseat.xml1
-rw-r--r--res/layout/wallpaper_chooser.xml3
-rw-r--r--res/layout/wallpaper_item.xml1
-rw-r--r--src/com/android/launcher2/AppsCustomizeTabHost.java2
-rw-r--r--src/com/android/launcher2/LauncherModel.java6
6 files changed, 11 insertions, 3 deletions
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index f6d234709..c0c87aff7 100644
--- a/res/layout-land/hotseat.xml
+++ b/res/layout-land/hotseat.xml
@@ -16,6 +16,7 @@
<com.android.launcher2.Hotseat
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ android:background="@drawable/hotseat_bg_panel"
launcher:cellCountX="1"
launcher:cellCountY="5">
<com.android.launcher2.CellLayout
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
index ee59a6ab8..035d95884 100644
--- a/res/layout-port/hotseat.xml
+++ b/res/layout-port/hotseat.xml
@@ -16,6 +16,7 @@
<com.android.launcher2.Hotseat
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ android:background="@drawable/hotseat_bg_panel"
launcher:cellCountX="5"
launcher:cellCountY="1">
<com.android.launcher2.CellLayout
diff --git a/res/layout/wallpaper_chooser.xml b/res/layout/wallpaper_chooser.xml
index c0a5fdf9e..60d971907 100644
--- a/res/layout/wallpaper_chooser.xml
+++ b/res/layout/wallpaper_chooser.xml
@@ -31,7 +31,8 @@
<Gallery android:id="@+id/gallery"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:spacing="0dp" />
<Button android:id="@+id/set"
android:layout_width="wrap_content"
diff --git a/res/layout/wallpaper_item.xml b/res/layout/wallpaper_item.xml
index cfd79e252..0834ce680 100644
--- a/res/layout/wallpaper_item.xml
+++ b/res/layout/wallpaper_item.xml
@@ -16,7 +16,6 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/wallpaper_image"
- android:background="?android:attr/galleryItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitXY"
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index d6ae1459e..124cf7332 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -138,10 +138,10 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
// Set the width and show the tab bar (if we have a loading graphic, we can switch
// it off here)
mTabs.getLayoutParams().width = contentWidth;
- mTabsContainer.setAlpha(1f);
post(new Runnable() {
public void run() {
mTabs.requestLayout();
+ mTabsContainer.setAlpha(1f);
}
});
}
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index e0b04dacb..080d9976c 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -686,6 +686,7 @@ public class LauncherModel extends BroadcastReceiver {
oldTask.stopLocked();
}
mLoaderTask = new LoaderTask(context, isLaunching);
+ sWorkerThread.setPriority(Thread.NORM_PRIORITY);
sWorker.post(mLoaderTask);
}
}
@@ -825,6 +826,11 @@ public class LauncherModel extends BroadcastReceiver {
if (DEBUG_LOADERS) Log.d(TAG, "step 2: special: loading workspace");
loadAndBindWorkspace();
}
+
+ // Restore the default thread priority after we are done loading items
+ synchronized (mLock) {
+ android.os.Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT);
+ }
}