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

Commit 8df2cef1 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev 

am: e09338a2

Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259
parents 6ad9f326 e09338a2

res/layout/search_panel.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/search_bar_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/suggestion_condition_background">

res/layout/settings_main_dashboard.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">

    <FrameLayout

        android:id="@+id/search_bar_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/suggestion_condition_background">

src/com/android/settings/dashboard/DashboardSummary.java

+4 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.settings.dashboard.suggestions.SuggestionDismissController; 
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;

import com.android.settings.dashboard.suggestions.SuggestionsChecks;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.ActionBarShadowController;

import com.android.settingslib.drawer.CategoryKey;

import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.SettingsDrawerActivity;
@@ -192,12 +193,14 @@ public class DashboardSummary extends InstrumentedFragment 
        mDashboard.setHasFixedSize(true);

        mDashboard.addItemDecoration(new DashboardDecorator(getContext()));

        mDashboard.setListener(this);

        Log.d(TAG, "adapter created");

        mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),

            mSuggestionParser, this /* SuggestionDismissController.Callback */);

        mDashboard.setAdapter(mAdapter);

        mDashboard.setItemAnimator(new DashboardItemAnimator());

        mSummaryLoader.setSummaryConsumer(mAdapter);

        ActionBarShadowController.attachToRecyclerView(

                getActivity().findViewById(R.id.search_bar_container), getLifecycle(), mDashboard);



        if (DEBUG_TIMING) {

            Log.d(TAG, "onViewCreated took "

                    + (System.currentTimeMillis() - startTime) + " ms");

src/com/android/settings/dashboard/conditional/CellularDataCondition.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class CellularDataCondition extends Condition { 
            setActive(false);

            return;

        }

        setActive(!telephony.getDataEnabled());

        setActive(!telephony.isDataEnabled());

    }



    @Override

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.provider.Settings; 
import android.support.annotation.NonNull;

import android.util.Log;



import com.android.internal.hardware.AmbientDisplayConfiguration;

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

import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;

import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
@@ -54,7 +53,6 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider 


    private final SuggestionRanker mSuggestionRanker;

    private final MetricsFeatureProvider mMetricsFeatureProvider;

    private final AmbientDisplayConfiguration mAmbientDisplayConfig;



    @Override

    public boolean isSmartSuggestionEnabled(Context context) {
@@ -96,7 +94,6 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider 
                new SuggestionFeaturizer(new EventStore(appContext)));

        mMetricsFeatureProvider = FeatureFactory.getFactory(appContext)

                .getMetricsFeatureProvider();

        mAmbientDisplayConfig = new AmbientDisplayConfiguration(appContext);

    }



    @Override