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

Commit 1152aee9 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Settings - add support for Launch by Default"

parents 8019aa6b 8b2ea39c

res/layout/app_domains_dialog.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

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

             android:paddingStart="24dp"

             android:paddingTop="16dp"

             android:paddingEnd="24dp">



    <ListView

            android:id="@android:id/list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scrollbarStyle="insideOverlay" />



</FrameLayout>

res/layout/app_domains_item.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->



<TextView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/domain_name"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="4dp"

    android:paddingEnd="4dp"

    android:paddingTop="16dp"

    />

res/layout/app_preferred_settings.xml

+10 −44
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
    android:scrollbarStyle="@integer/preference_scrollbar_style">



    <LinearLayout

        android:id="@+id/all_details"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
@@ -31,19 +30,6 @@ 
        android:paddingBottom="5dip"

        android:orientation="vertical">



        <!-- Prefered activities section -->

        <TextView android:id="@+id/auto_launch_title"

            style="?android:attr/listSeparatorTextViewStyle"

            android:layout_marginTop="8dip"

            android:text="@string/auto_launch_label" />



        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

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

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



        <TextView android:id="@+id/auto_launch"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:layout_alignParentStart="true"
@@ -51,33 +37,13 @@ 
            android:layout_height="wrap_content"

            android:paddingTop="6dip" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_below="@id/auto_launch"

                android:paddingTop="4dip"

                android:orientation="horizontal">



                <View

                    android:layout_width="120dip"

                    android:layout_height="0dip"

                    android:layout_weight="0.4" />

                <View

                    android:layout_width="0dip"

                    android:layout_height="0dip"

                    android:visibility="invisible"

                    android:layout_weight="0.2" />

        <Button

            android:id="@+id/clear_activities_button"

                    android:layout_width="120dip"

            android:layout_marginStart="-4dip"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                    android:layout_weight="0.4"

            android:text="@string/clear_activities" />



    </LinearLayout>



        </RelativeLayout>



    </LinearLayout>



</ScrollView>

res/layout/default_apps_view.xml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



    <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="0px"

            android:layout_weight="1">



        <ListView android:id="@android:id/list"

                style="@style/PreferenceFragmentListSinglePane"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:drawSelectorOnTop="false"

                android:scrollbarStyle="outsideOverlay"

                android:fastScrollEnabled="true" />



        <TextView android:id="@android:id/empty"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:gravity="center"

                android:text="@string/no_default_apps"

                android:textAppearance="?android:attr/textAppearanceLarge" />



    </FrameLayout>



</LinearLayout>

res/layout/default_apps_view_item.xml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->



<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="?android:attr/listPreferredItemHeight"

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

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

            android:paddingTop="8dip"

            android:paddingBottom="8dip"

            android:columnCount="4">



    <ImageView

            android:id="@+id/app_icon"

            android:layout_width="@android:dimen/app_icon_size"

            android:layout_height="@android:dimen/app_icon_size"

            android:layout_rowSpan="2"

            android:layout_marginEnd="8dip"

            android:scaleType="centerInside"

            android:contentDescription="@null" />



    <TextView

            android:id="@+id/app_name"

            android:layout_width="0dip"

            android:layout_columnSpan="2"

            android:layout_gravity="fill_horizontal"

            android:layout_marginTop="2dip"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="@android:style/TextAppearance.Material.Subhead"

            android:textAlignment="viewStart"/>



    <TextView

            android:id="@+id/app_domains"

            android:layout_column="1"

            android:layout_row="1"

            android:layout_gravity="fill_horizontal|top"

            android:textAppearance="@android:style/TextAppearance.Material.Body1"

            android:textColor="?android:attr/textColorSecondary"

            android:textAlignment="viewStart" />



</GridLayout>