Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dde8455 authored by Victor Chang's avatar Victor Chang
Browse files

TrustCredentials listview should be expanded by default 

UI Change for 2-profile case:
1. When both personal and work listview are expanded, half height is allocated for each list view
2. When only one listview is expanded, full height is allocated to the list view

Video can be found at go/trust-cred-split-view

- Use 2 ListView instead of 1 ExpandableListView in order to scoll the list independently
- The ui is not changed for only one or more than 3 profiles.
- Remove TrustedCertificateAdapterCommons, and wrap GroupAdapter by ChildAdapter in order to re-use more codes
- clear mAliasLoaders in onDestroy. (Seems it's a bug.)
- When work mode or fbe locked, force to collapse work list view. User message will be prompted when user press on header
- Groups in GroupAdapter is set synchronously instead of async, since we assume the number of users are fixed during initialization
- DataSet events will go through GroupAdapter to notifiy ChildAdapter

Bug:28236955
Change-Id: Iebfcd3fcb6515b42687e133b11696c42db63d18f
parent 29094b2e

res/layout/trusted_credential.xml

+2 −0
Original line number Diff line number Diff line
@@ -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">

res/layout/trusted_credential_list_container.xml

0 → 100644
+57 −0
Original line number 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 Diff line number Diff line
@@ -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>



                    <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"

                    android:layout_width="fill_parent"

                    android:layout_height="fill_parent"

                    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

                    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

                    android:scrollbarStyle="outsideOverlay"

                        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>



                    <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"

                    android:layout_width="fill_parent"

                    android:layout_height="fill_parent"

                    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

                    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

                    android:scrollbarStyle="outsideOverlay"

                        style="@style/TrustedCredentialsList"

                        android:visibility="gone">

                    </ExpandableListView>

                </LinearLayout>



            </FrameLayout>

res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/TrustedCredentialsSettings.java

+305 −199

File changed.

Preview size limit exceeded, changes collapsed.