Merge "TrustCredentials listview should be expanded by default" into nyc-dev (963c3a4e) · Commits · e / os / android_packages_apps_Settings

res/layout/trusted_credential.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,8 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:gravity="center_vertical"		android:gravity="center_vertical"
	android:background="?android:attr/selectableItemBackground"		android:background="?android:attr/selectableItemBackground"
			android:paddingStart="?android:attr/listPreferredItemPaddingStart"
			android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
	android:paddingTop="15dip"		android:paddingTop="15dip"
	android:paddingBottom="15dip">		android:paddingBottom="15dip">

res/layout/trusted_credential_list_container.xml

0 → 100644

+57 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2016 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.
			-->
			<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
			android:layout_width="fill_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical"
			android:visibility="gone">
			<LinearLayout
			android:id="@+id/header_view"
			android:layout_width="fill_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical"
			android:clickable="true"
			android:background="?android:attr/selectableItemBackground"
			android:visibility="gone">

			<View
			android:id="@+id/header_divider"
			android:layout_width="match_parent"
			android:layout_height="2dp"
			android:background="?android:attr/listDivider"
			android:visibility="gone"/>
			<LinearLayout
			android:layout_width="fill_parent"
			android:layout_height="wrap_content"
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:paddingStart="?android:attr/listPreferredItemPaddingStart"
			android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
			<ImageView
			android:id="@+id/group_indicator"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"/>
			<FrameLayout
			android:id="@+id/header_content_container"
			android:layout_width="fill_parent"
			android:layout_height="wrap_content"/>
			</LinearLayout>
			</LinearLayout>
			<ListView
			android:id="@+id/cert_list"
			style="@style/TrustedCredentialsList">
			</ListView>
			</LinearLayout>
			No newline at end of file

res/layout/trusted_credentials.xml

+37 −34

Original line number	Original line	Diff line number	Diff line
	@@ -49,25 +49,26 @@
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
	android:visibility="gone" />		android:visibility="gone" />

	<ListView		<LinearLayout
	android:id="@+id/system_list"		android:id="@+id/system_content"
	android:layout_width="fill_parent"		android:orientation="vertical"
	android:layout_height="fill_parent"		android:layout_width="match_parent"
	android:paddingStart="?android:attr/listPreferredItemPaddingStart"		android:layout_height="match_parent"
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
	android:scrollbarStyle="outsideOverlay"
	android:visibility="gone">		android:visibility="gone">
	</ListView>
			<include
			android:id="@+id/system_personal_container"
			layout="@layout/trusted_credential_list_container"/>
			<include
			android:id="@+id/system_work_container"
			layout="@layout/trusted_credential_list_container"/>

	<ExpandableListView		<ExpandableListView
	android:id="@+id/system_expandable_list"		android:id="@+id/system_expandable_list"
	android:layout_width="fill_parent"		style="@style/TrustedCredentialsList"
	android:layout_height="fill_parent"
	android:paddingStart="?android:attr/listPreferredItemPaddingStart"
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
	android:scrollbarStyle="outsideOverlay"
	android:visibility="gone">		android:visibility="gone">
	</ExpandableListView>		</ExpandableListView>
			</LinearLayout>

	</FrameLayout>		</FrameLayout>

	@@ -85,25 +86,27 @@
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
	android:visibility="gone" />		android:visibility="gone" />

	<ListView		<LinearLayout
	android:id="@+id/user_list"		android:id="@+id/user_content"
	android:layout_width="fill_parent"		android:orientation="vertical"
	android:layout_height="fill_parent"		android:layout_width="match_parent"
	android:paddingStart="?android:attr/listPreferredItemPaddingStart"		android:layout_height="match_parent"
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
	android:scrollbarStyle="outsideOverlay"
	android:visibility="gone">		android:visibility="gone">
	</ListView>
			<include
			android:id="@+id/user_personal_container"
			layout="@layout/trusted_credential_list_container"/>

			<include
			android:id="@+id/user_work_container"
			layout="@layout/trusted_credential_list_container"/>

	<ExpandableListView		<ExpandableListView
	android:id="@+id/user_expandable_list"		android:id="@+id/user_expandable_list"
	android:layout_width="fill_parent"		style="@style/TrustedCredentialsList"
	android:layout_height="fill_parent"
	android:paddingStart="?android:attr/listPreferredItemPaddingStart"
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
	android:scrollbarStyle="outsideOverlay"
	android:visibility="gone">		android:visibility="gone">
	</ExpandableListView>		</ExpandableListView>
			</LinearLayout>

	</FrameLayout>		</FrameLayout>

res/values/styles.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -146,6 +146,12 @@
	<style name="SettingsPreferenceHeaderList" parent="@*android:style/PreferenceHeaderList">		<style name="SettingsPreferenceHeaderList" parent="@*android:style/PreferenceHeaderList">
	</style>		</style>

			<style name="TrustedCredentialsList">
			<item name="android:layout_width">fill_parent</item>
			<item name="android:layout_height">fill_parent</item>
			<item name="android:scrollbarStyle">outsideOverlay</item>
			</style>

	<style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">		<style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
	<item name="android:layout">@layout/preference_list_fragment</item>		<item name="android:layout">@layout/preference_list_fragment</item>
	</style>		</style>

src/com/android/settings/TrustedCredentialsSettings.java

+305 −199

File changed.

Preview size limit exceeded, changes collapsed.