Merge "Rework manage applications to be page-able." into jb-dev (a8e3ab89) · Commits · e / os / android_packages_apps_Settings

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_JAVA_LIBRARIES := bouncycastle
		LOCAL_STATIC_JAVA_LIBRARIES := guava
		LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4

		LOCAL_MODULE_TAGS := optional

res/layout/manage_applications.xml→res/layout/manage_applications_apps.xml

100755 → 100644

+2 −8

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2008 The Android Open Source Project
		<!-- Copyright (C) 2012 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.
		@@ -83,12 +83,6 @@
		</view>
		</LinearLayout>

		<view class="com.android.settings.applications.RunningProcessesView"
		android:id="@+id/running_processes"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone" />

		<LinearLayout android:id="@+id/loading_container"
		android:orientation="vertical"
		android:layout_width="match_parent"

res/layout/manage_apps_spinner_content.xml→res/layout/manage_applications_content.xml

+41 −0

Original line number	Diff line number	Diff line
		@@ -25,27 +25,17 @@
		android:layout_height="match_parent"
		android:orientation="vertical">

		<Spinner
		android:id="@+id/spinner"
		android:layout_width="wrap_content"
		android:layout_height="48sp"
		android:minWidth="180dp"
		android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
		android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
		/>

		<ImageView
		<android.support.v4.view.ViewPager
		android:id="@+id/pager"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
		android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
		android:scaleType="fitXY"
		android:src="?android:attr/listDivider" />

		<FrameLayout
		android:id="@+id/spinner_content"
		android:layout_height="match_parent"
		android:layout_weight="1">
		<android.support.v4.view.PagerTabStrip
		android:id="@+id/tabs"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1" />
		android:layout_height="wrap_content"
		android:layout_gravity="top">
		</android.support.v4.view.PagerTabStrip>
		</android.support.v4.view.ViewPager>

		</LinearLayout>

res/layout/manage_applications_running.xml

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2012 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.
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent" >
		<view class="com.android.settings.applications.RunningProcessesView"
		android:id="@+id/running_processes"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone" />

		<LinearLayout android:id="@+id/loading_container"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
		android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
		android:visibility="gone"
		android:gravity="center">

		<ProgressBar style="?android:attr/progressBarStyleLarge"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />
		<TextView android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:text="@string/settings_safetylegal_activity_loading"
		android:paddingTop="4dip"
		android:singleLine="true" />

		</LinearLayout>

		</FrameLayout>

src/com/android/settings/applications/AppViewHolder.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ public class AppViewHolder {
		}
		}

		void updateSizeText(ManageApplications ma, int whichSize) {
		void updateSizeText(CharSequence invalidSizeStr, int whichSize) {
		if (ManageApplications.DEBUG) Log.i(ManageApplications.TAG, "updateSizeText of " + entry.label + " " + entry
		+ ": " + entry.sizeStr);
		if (entry.sizeStr != null) {
		@@ -58,7 +58,7 @@ public class AppViewHolder {
		break;
		}
		} else if (entry.size == ApplicationsState.SIZE_INVALID) {
		appSize.setText(ma.mInvalidSizeStr);
		appSize.setText(invalidSizeStr);
		}
		}
		}
		No newline at end of file