PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move Home settings to Default apps"

Browse Source
This commit is contained in:
Jason Monk
2016-01-26 14:45:25 +00:00
committed by Android (Google) Code Review
parent 4e88857db7 7ea14c5625
commit 7cd90e012c
8 changed files with 204 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
res/layout/app_preference_item.xml
View File

@@ -18,35 +18,55 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:padding="6dip">
<ImageView
android:id="@+id/app_image"
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:padding="6dip"
/>
<TextView
android:id="@+id/app_label"
android:duplicateParentState="true"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
android:paddingEnd="7dip"
android:ellipsize="marquee"
/>
android:layout_gravity="center_vertical"
android:duplicateParentState="true"
android:orientation="vertical">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
android:paddingEnd="7dip"
android:ellipsize="marquee"
android:duplicateParentState="true"
/>
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:gravity="center_vertical"
android:paddingEnd="7dip"
android:ellipsize="marquee"
android:visibility="gone"
android:duplicateParentState="true"
/>
</LinearLayout>
<TextView
android:id="@+id/default_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceSmall"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:text="@string/default_app"
android:visibility="gone"
android:paddingEnd="7dip"
/>
android:duplicateParentState="true"
/>
</LinearLayout>

6
res/values/strings.xml
View File

@@ -7001,4 +7001,10 @@
<!-- Title for switch to allow app unrestricted data usage [CHAR LIMIT=30] -->
<string name="unrestricted_app_summary">Allow unrestricted data access when Data Saver is on</string>
<!-- Button to switch the default home app [CHAR LIMIT=60] -->
<string name="home_app">Home app</string>
<!-- No default home set summary [CHAR LIMIT=NONE] -->
<string name="no_default_home">No default Home</string>
</resources>

6
res/xml/default_apps.xml
View File

@@ -25,6 +25,12 @@
android:title="@string/assist_and_voice_input_title"
/>
<com.android.settings.applications.DefaultHomePreference
android:key="default_home"
android:title="@string/home_app"
android:summary="@string/no_default_home"
/>
<com.android.settings.applications.DefaultBrowserPreference
android:key="default_browser"
android:title="@string/default_browser_title"