diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-03 11:39:27 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2014-11-03 11:39:27 -0800 |
commit | b9f261fd3adfe733333a4cf2c72081cde2a69e13 (patch) | |
tree | fcd536869e5955b88d1432d050438fc460ca6b0b | |
parent | 96d2cc235dff94d6109cd480fef13afbefa459f1 (diff) | |
download | android_packages_apps_Trebuchet-b9f261fd3adfe733333a4cf2c72081cde2a69e13.tar.gz android_packages_apps_Trebuchet-b9f261fd3adfe733333a4cf2c72081cde2a69e13.tar.bz2 android_packages_apps_Trebuchet-b9f261fd3adfe733333a4cf2c72081cde2a69e13.zip |
Clearing some android list errors/warnings.
Change-Id: I2f1f991e61f9e41644ee9943f5a1a15971cca6c1
-rw-r--r-- | res/layout-land/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-port/qsb.xml | 2 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-sw720dp/qsb.xml | 2 | ||||
-rw-r--r-- | res/layout/apps_customize_pane.xml | 2 | ||||
-rw-r--r-- | res/layout/apps_customize_widget.xml | 6 | ||||
-rw-r--r-- | res/layout/hotseat.xml | 2 | ||||
-rw-r--r-- | res/layout/launcher_overlay_example.xml | 2 | ||||
-rw-r--r-- | res/layout/page_indicator.xml | 2 | ||||
-rw-r--r-- | res/layout/page_indicator_marker.xml | 2 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 2 | ||||
-rw-r--r-- | res/layout/workspace_screen.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/AppsCustomizeTabHost.java | 14 | ||||
-rw-r--r-- | src/com/android/launcher3/PagedViewWidgetImageView.java | 2 |
15 files changed, 16 insertions, 30 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 0858d6a62..6f95bd506 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -17,7 +17,7 @@ <!-- Full screen view projects under the status bar and contains the background --> <com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/launcher" android:layout_width="match_parent" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 7ba7a8963..9e4c24515 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -17,7 +17,7 @@ <!-- Full screen view projects under the status bar and contains the background --> <com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/launcher" android:layout_width="match_parent" diff --git a/res/layout-port/qsb.xml b/res/layout-port/qsb.xml index 4c9963dfb..0afc2d2f9 100644 --- a/res/layout-port/qsb.xml +++ b/res/layout-port/qsb.xml @@ -15,7 +15,7 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/search_frame"> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index d4fa2fa0d..1ef7df5fe 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -17,7 +17,7 @@ <!-- Full screen view projects under the status bar and contains the background --> <com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/launcher" android:layout_width="match_parent" diff --git a/res/layout-sw720dp/qsb.xml b/res/layout-sw720dp/qsb.xml index 4c9963dfb..0afc2d2f9 100644 --- a/res/layout-sw720dp/qsb.xml +++ b/res/layout-sw720dp/qsb.xml @@ -15,7 +15,7 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/search_frame"> diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index bf5f71b90..e42576ffe 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -15,7 +15,7 @@ --> <com.android.launcher3.AppsCustomizeTabHost xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:clipChildren="false"> <LinearLayout diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml index e299b32b0..a8344e3ff 100644 --- a/res/layout/apps_customize_widget.xml +++ b/res/layout/apps_customize_widget.xml @@ -15,7 +15,7 @@ --> <com.android.launcher3.PagedViewWidget xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" @@ -66,7 +66,7 @@ android:background="@color/widget_text_panel" android:orientation="horizontal"> <!-- The name of the widget. --> - <TextView xmlns:android="http://schemas.android.com/apk/res/android" + <TextView android:id="@+id/widget_name" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -85,7 +85,7 @@ <!-- The original dimensions of the widget (can't be the same text as above due to different style. --> - <TextView xmlns:android="http://schemas.android.com/apk/res/android" + <TextView android:id="@+id/widget_dims" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/hotseat.xml b/res/layout/hotseat.xml index dc9ed2a6f..7bef889a9 100644 --- a/res/layout/hotseat.xml +++ b/res/layout/hotseat.xml @@ -15,7 +15,7 @@ --> <com.android.launcher3.Hotseat xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> + xmlns:launcher="http://schemas.android.com/apk/res-auto"> <com.android.launcher3.CellLayout android:id="@+id/layout" android:layout_width="wrap_content" diff --git a/res/layout/launcher_overlay_example.xml b/res/layout/launcher_overlay_example.xml index 1556b6f90..7d92d4f0d 100644 --- a/res/layout/launcher_overlay_example.xml +++ b/res/layout/launcher_overlay_example.xml @@ -16,7 +16,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" launcher:layout_ignoreInsets="true"> diff --git a/res/layout/page_indicator.xml b/res/layout/page_indicator.xml index 14eff75d0..68fe3dd60 100644 --- a/res/layout/page_indicator.xml +++ b/res/layout/page_indicator.xml @@ -15,7 +15,7 @@ --> <com.android.launcher3.PageIndicator xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:animateLayoutChanges="true" launcher:windowSize="@integer/config_maxNumberOfPageIndicatorsToShow"> </com.android.launcher3.PageIndicator> diff --git a/res/layout/page_indicator_marker.xml b/res/layout/page_indicator_marker.xml index 7c0c38920..686d27569 100644 --- a/res/layout/page_indicator_marker.xml +++ b/res/layout/page_indicator_marker.xml @@ -15,7 +15,7 @@ --> <com.android.launcher3.PageIndicatorMarker xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="16dp" android:layout_height="16dp" android:layout_gravity="center_vertical"> diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 31e9da06e..ed8d43e46 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -16,7 +16,7 @@ <com.android.launcher3.Folder xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml index 855cf39f5..83b319b72 100644 --- a/res/layout/workspace_screen.xml +++ b/res/layout/workspace_screen.xml @@ -16,7 +16,7 @@ <com.android.launcher3.CellLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/com/android/launcher3/AppsCustomizeTabHost.java b/src/com/android/launcher3/AppsCustomizeTabHost.java index df65cbaa1..69e3ac17f 100644 --- a/src/com/android/launcher3/AppsCustomizeTabHost.java +++ b/src/com/android/launcher3/AppsCustomizeTabHost.java @@ -16,27 +16,13 @@ package com.android.launcher3; -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; import android.content.Context; -import android.content.res.Resources; -import android.graphics.Color; import android.graphics.Rect; import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; import android.widget.FrameLayout; -import android.widget.LinearLayout; -import android.widget.TabHost; -import android.widget.TabWidget; -import android.widget.TextView; - -import java.util.ArrayList; public class AppsCustomizeTabHost extends FrameLayout implements LauncherTransitionable, Insettable { static final String LOG_TAG = "AppsCustomizeTabHost"; diff --git a/src/com/android/launcher3/PagedViewWidgetImageView.java b/src/com/android/launcher3/PagedViewWidgetImageView.java index 71f5eead3..7d8279547 100644 --- a/src/com/android/launcher3/PagedViewWidgetImageView.java +++ b/src/com/android/launcher3/PagedViewWidgetImageView.java @@ -21,7 +21,7 @@ import android.graphics.Canvas; import android.util.AttributeSet; import android.widget.ImageView; -class PagedViewWidgetImageView extends ImageView { +public class PagedViewWidgetImageView extends ImageView { public boolean mAllowRequestLayout = true; public PagedViewWidgetImageView(Context context, AttributeSet attrs) { |