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

Commit 72354620 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-41...

release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-4176727 snap-temp-L91200000081901352

Change-Id: I5a18dd261e0a3581177431870a4a180e201ad6df
parents 23dd3510 84040fdb
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -14,20 +14,20 @@
     limitations under the License.
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:paddingStart="20dp"
    android:paddingEnd="20dp"
    android:paddingTop="16dp"
    android:paddingBottom="12dp"
    >
    android:paddingBottom="12dp">

    <EditText
        android:id="@+id/edittext"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:inputType="textCapSentences"
        android:maxLength="50"
        android:singleLine="true"
    />
        android:singleLine="true" />
</LinearLayout>
+13 −22
Original line number Diff line number Diff line
@@ -24,23 +24,17 @@
    android:layout_height="match_parent"
    app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">

    <FrameLayout
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical"
        android:clipToPadding="false"
        android:clipChildren="false">

        <include
            layout="@layout/fingerprint_enroll_find_sensor_graphic"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_gravity="center_horizontal|bottom"/>

        <LinearLayout
            style="@style/SuwContentFrame"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:clipToPadding="false"
            android:clipChildren="false">
@@ -51,21 +45,18 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="@dimen/suw_description_glif_margin_top"
                android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
        </LinearLayout>

            <View
        <Space
            android:layout_width="wrap_content"
            android:layout_height="0dp"
                android:layout_width="match_parent"
            android:layout_weight="1" />

            <Button
                style="@style/SuwGlifButton.Secondary"
                android:id="@+id/next_button"
                android:layout_width="wrap_content"
        <include
            layout="@layout/fingerprint_enroll_find_sensor_graphic"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
                android:layout_marginBottom="4dp"
                android:layout_gravity="end"
                android:text="@string/fingerprint_enroll_button_next" />
            android:layout_gravity="center_horizontal"/>

    </LinearLayout>
    </FrameLayout>
</com.android.setupwizardlib.GlifLayout>
+79 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2017 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"
        xmlns:settings="http://schemas.android.com/apk/res-auto"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="8dp"
        android:paddingBottom="8dp"
        android:paddingStart="@dimen/preference_no_icon_padding_start"
        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
        android:orientation="horizontal">

    <!-- Shows the data plan usage in chart -->
    <com.android.settings.widget.DonutView
            android:id="@+id/donut"
            android:layout_width="72dp"
            android:layout_height="72dp"
            android:layout_marginEnd="8dp"
            android:layout_gravity="center"
            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
            android:gravity="end|center_vertical"
            settings:applyColorAccent="false"
            settings:showPercentString="false"
            settings:thickness="6dp"/>

    <LinearLayout
            android:id="@+id/data_plan_row"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:paddingTop="2dp"
            android:orientation="vertical">

        <!-- Shows the data plan usage -->
        <TextView
                android:id="@android:id/title"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="0dp"
                android:paddingTop="0dp"
                android:fontFamily="@*android:string/config_headlineFontFamily"
                android:textAppearance="@android:style/TextAppearance.Material.Title"/>

        <!-- Shows the data plan name -->
        <TextView
                android:id="@android:id/text1"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:paddingBottom="5dp"
                android:maxLines="3"
                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
                android:textColor="?android:attr/textColorSecondary"/>

        <!-- Shows the data plan description -->
        <TextView
                android:id="@android:id/text2"
                android:textStyle="italic"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:maxLines="5"
                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
                android:textColor="?android:attr/textColorSecondary"/>
    </LinearLayout>
</LinearLayout>
+15 −9
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
    android:title="@string/bluetooth_settings">

    <Preference
@@ -26,11 +25,18 @@
        android:key="paired_devices"
        android:title="@string/bluetooth_paired_device_title" />

    <com.android.settings.DividerPreference
    <PreferenceCategory>

        <Preference
            android:key="bt_rename_device"
            android:title="@string/bluetooth_device_name"
            android:summary="@string/summary_placeholder" />

        <Preference
            android:key="bt_received_files"
        android:title="@string/bluetooth_show_received_files"
        settings:allowDividerAbove="true"
        settings:allowDividerBelow="true"/>
            android:title="@string/bluetooth_show_received_files" />

    </PreferenceCategory>

    <com.android.settingslib.widget.FooterPreference />

+3 −2
Original line number Diff line number Diff line
@@ -215,8 +215,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
    }

    // Storage types. Used to determine what the extra item in the list of preferences is.
    public static final int STORAGE_TYPE_DEFAULT = 0;
    public static final int STORAGE_TYPE_DEFAULT = 0; // Show all apps that are not categorized.
    public static final int STORAGE_TYPE_MUSIC = 1;
    public static final int STORAGE_TYPE_LEGACY = 2; // Show apps even if they can be categorized.

    // sort order
    private int mSortOrder = R.id.sort_order_alpha;
@@ -434,7 +435,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
        if (listType == LIST_TYPE_STORAGE) {
            if (storageType == STORAGE_TYPE_MUSIC) {
                filter = new CompoundFilter(ApplicationsState.FILTER_AUDIO, filter);
            } else {
            } else if (storageType == STORAGE_TYPE_DEFAULT) {
                filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
            }
            return filter;
Loading