Depend on support lib preferences (39b46748) · Commits · e / os / android_packages_apps_Settings

Android.mk

+16 −2

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

		LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common ims-common
		LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
		LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-v4 \
		android-support-v13 \
		android-support-v7-recyclerview \
		android-support-v7-preference \
		android-support-v7-appcompat \
		android-support-v14-preference \
		jsr305

		LOCAL_MODULE_TAGS := optional

		@@ -10,7 +17,11 @@ LOCAL_SRC_FILES := \
		$(call all-java-files-under, src) \
		src/com/android/settings/EventLogTags.logtags

		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
		frameworks/support/v7/preference/res \
		frameworks/support/v14/preference/res \
		frameworks/support/v7/appcompat/res \
		frameworks/support/v7/recyclerview/res

		LOCAL_PACKAGE_NAME := Settings
		LOCAL_CERTIFICATE := platform
		@@ -18,6 +29,9 @@ LOCAL_PRIVILEGED_MODULE := true

		LOCAL_PROGUARD_FLAG_FILES := proguard.flags

		LOCAL_AAPT_FLAGS := --auto-add-overlay \
		--extra-packages android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview

		ifneq ($(INCREMENTAL_BUILDS),)
		LOCAL_PROGUARD_ENABLED := disabled
		LOCAL_JACK_ENABLED := incremental

res/layout/dream_info_row.xml

+45 −57

Original line number	Diff line number	Diff line
		@@ -13,21 +13,14 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<!-- Dream selectable row (icon, caption, radio button) -->

		<RelativeLayout
		android:id="@android:id/widget_frame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_toStartOf="@+id/divider"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:clickable="true"
		android:focusable="true"
		android:orientation="horizontal"
		android:background="?android:attr/selectableItemBackground" >

		<!-- Dream icon -->
		@@ -50,13 +43,13 @@

		<TextView
		android:id="@android:id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:layout_centerVertical="true"
		android:layout_toStartOf="@android:id/button1"
		android:layout_toEndOf="@android:id/icon"
		android:ellipsize="end"
		android:singleLine="true"
		android:gravity="center_vertical"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAlignment="viewStart"
		android:labelFor="@android:id/button2" />
		@@ -72,16 +65,14 @@
		android:duplicateParentState="true"
		android:clickable="false"
		android:focusable="false" />
		</RelativeLayout>

		<!-- Divider -->

		<ImageView
		android:id="@id/divider"
		android:id="@+id/divider"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_centerVertical="true"
		android:layout_toStartOf="@android:id/button2"
		android:contentDescription="@null"
		android:src="@drawable/nav_divider" />

		@@ -91,9 +82,6 @@
		android:id="@android:id/button2"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_alignBottom="@android:id/widget_frame"
		android:layout_alignParentEnd="true"
		android:layout_alignTop="@android:id/widget_frame"
		android:layout_centerVertical="true"
		android:layout_margin="0dip"
		android:background="?android:attr/selectableItemBackground"
		@@ -103,4 +91,4 @@
		android:focusable="true"
		android:src="@drawable/ic_bt_config" />

		</RelativeLayout>
		</LinearLayout>

res/layout/layout_preference_frame.xml

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2015 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="wrap_content" />

res/layout/preference_list_fragment.xml

+5 −2

Original line number	Diff line number	Diff line
		@@ -29,11 +29,13 @@
		android:layout_height="wrap_content"
		android:visibility="gone" />

		<FrameLayout android:layout_height="0px"
		<FrameLayout
		android:id="@id/list_container"
		android:layout_height="0px"
		android:layout_weight="1"
		android:layout_width="match_parent">

		<ListView android:id="@android:id/list"
		<ListView android:id="@+id/backup_list"
		style="@style/PreferenceFragmentListSinglePane"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -45,6 +47,7 @@
		android:clipToPadding="false"
		android:drawSelectorOnTop="false"
		android:elevation="@dimen/dashboard_category_elevation"
		android:visibility="gone"
		android:scrollbarAlwaysDrawVerticalTrack="true" />

		<include layout="@layout/loading_container" />

res/layout/preference_material_settings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		android:clipToPadding="false">

		<LinearLayout
		android:id="@*android:id/icon_frame"
		android:id="@id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="60dp"