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

Merge "TrustCredentials listview should be expanded by default" into nyc-dev

Browse Source 
am: 963c3a4e9f

* commit '963c3a4e9f06808c098fe3de4aaec5033431f21d':
  TrustCredentials listview should be expanded by default

Change-Id: I5ac13d383e7565acade2272c805e20b67fdc856a
This commit is contained in:
Victor Chang
2016-05-06 15:33:52 +00:00
committed by android-build-merger
parent 19f57505a0 963c3a4e9f
commit d48f9cf78e
5 changed files with 407 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/trusted_credential.xml
View File

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

57
res/layout/trusted_credential_list_container.xml Normal file
View File

@@ -0,0 +1,57 @@
<?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>

71
res/layout/trusted_credentials.xml
View File

@@ -49,25 +49,26 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:visibility="gone" />
<ListView
android:id="@+id/system_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:scrollbarStyle="outsideOverlay"
<LinearLayout
android:id="@+id/system_content"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
</ListView>
<ExpandableListView
android:id="@+id/system_expandable_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:scrollbarStyle="outsideOverlay"
android:visibility="gone">
</ExpandableListView>
<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
android:id="@+id/system_expandable_list"
style="@style/TrustedCredentialsList"
android:visibility="gone">
</ExpandableListView>
</LinearLayout>
</FrameLayout>
@@ -85,25 +86,27 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:visibility="gone" />
<ListView
android:id="@+id/user_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:scrollbarStyle="outsideOverlay"
<LinearLayout
android:id="@+id/user_content"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
</ListView>
<ExpandableListView
android:id="@+id/user_expandable_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:scrollbarStyle="outsideOverlay"
android:visibility="gone">
</ExpandableListView>
<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
android:id="@+id/user_expandable_list"
style="@style/TrustedCredentialsList"
android:visibility="gone">
</ExpandableListView>
</LinearLayout>
</FrameLayout>

6
res/values/styles.xml
View File

@@ -146,6 +146,12 @@
<style name="SettingsPreferenceHeaderList" parent="@*android:style/PreferenceHeaderList">
</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">
<item name="android:layout">@layout/preference_list_fragment</item>
</style>