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

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

release-request-6db00e04-e62d-4e43-807a-a9cc1185dcbb-for-git_oc-mr1-release-41... 

release-request-6db00e04-e62d-4e43-807a-a9cc1185dcbb-for-git_oc-mr1-release-4136929 snap-temp-L91700000077883673

Change-Id: I102f2bdbed32251937e4928f2f370b5813f91a9f
parents d69c7694 58005fc5

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -2364,6 +2364,7 @@ 
        <!-- Triggered when user-selected home app isn't encryption aware -->

        <activity android:name=".FallbackHome"

                  android:excludeFromRecents="true"

                  android:label=""

                  android:screenOrientation="nosensor"

                  android:theme="@style/FallbackHome">

            <intent-filter android:priority="-1000">

res/layout/dashboard_header_spacer.xml

deleted100644 → 0
+0 −25
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"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="@dimen/search_bar_margin">

    <View

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"/>

</LinearLayout>

res/layout/settings_main_dashboard.xml

+26 −22
Original line number Diff line number Diff line
@@ -17,14 +17,15 @@ 
*/

-->



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

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_width="match_parent">

    android:orientation="vertical">

    <FrameLayout

        android:id="@+id/main_content"

        android:layout_height="match_parent"

        android:layout_width="match_parent"/>

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/material_grey_300">

        <android.support.v7.widget.CardView

            android:id="@+id/search_bar"

            android:layout_width="match_parent"
@@ -37,12 +38,15 @@ 
                android:id="@+id/search_action_bar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/search_bar_negative_margin"

                android:background="?android:attr/selectableItemBackground"

                android:contentInsetStartWithNavigation="64dp"

                android:navigationIcon="@drawable/ic_search_24dp"

            android:title="@string/search_menu"

            android:titleTextAppearance="?android:attr/subtitleTextAppearance"

            android:titleTextColor="?android:attr/textColorHint"

                android:titleTextColor="@*android:color/text_color_primary"

                android:theme="?android:attr/actionBarTheme"/>

        </android.support.v7.widget.CardView>

    </FrameLayout>

    <FrameLayout

        android:id="@+id/main_content"

        android:layout_height="match_parent"

        android:layout_width="match_parent"/>

</LinearLayout>

src/com/android/settings/DateTimeSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.UserManager; 
import android.provider.SearchIndexableResource;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.datetime.AutoTimePreferenceController;
@@ -36,6 +35,7 @@ import com.android.settings.datetime.TimePreferenceController; 
import com.android.settings.datetime.TimeZonePreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.datetime.ZoneGetter;



import java.util.ArrayList;
@@ -72,8 +72,8 @@ public class DateTimeSettings extends DashboardFragment implements 
    }



    @Override

    protected List<PreferenceController> getPreferenceControllers(Context context) {

        final List<PreferenceController> controllers = new ArrayList<>();

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        final Activity activity = getActivity();

        final Intent intent = activity.getIntent();

        final boolean isFromSUW = intent.getBooleanExtra(EXTRA_IS_FROM_SUW, false);

src/com/android/settings/DeviceInfoSettings.java

+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Intent; 
import android.provider.SearchIndexableResource;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
@@ -41,6 +40,7 @@ import com.android.settings.deviceinfo.SafetyInfoPreferenceController; 
import com.android.settings.deviceinfo.SecurityPatchPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;



import java.util.ArrayList;
@@ -84,7 +84,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
    }



    @Override

    protected List<PreferenceController> getPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

        return buildPreferenceControllers(context, getActivity(), this /* fragment */,

                getLifecycle());

    }
@@ -114,9 +114,9 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
        }

    };



    private static List<PreferenceController> buildPreferenceControllers(Context context,

    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

            Activity activity, Fragment fragment, Lifecycle lifecycle) {

        final List<PreferenceController> controllers = new ArrayList<>();

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(

                new BuildNumberPreferenceController(context, activity, fragment, lifecycle));

        controllers.add(new AdditionalSystemUpdatePreferenceController(context));
@@ -149,7 +149,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
                }



                @Override

                public List<PreferenceController> getPreferenceControllers(Context context) {

                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {

                    return buildPreferenceControllers(context, null /*activity */,

                            null /* fragment */, null /* lifecycle */);

                }