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

Commit a35b49a1 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Search results page polish" into oc-dr1-dev 

am: 692a4b55

Change-Id: I9953971cfaa2c78b2be9fbd027f7cdb029bbb9c1
parents b26ac1f3 692a4b55

res/drawable/search_panel_list_background.xml

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

<!-- Copyright (C) 2014 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.

-->



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

    android:inset="0dip">



    <color android:color="?android:attr/colorBackground" />



</inset>

res/layout/search_panel.xml

+36 −24
Original line number Diff line number Diff line
@@ -13,19 +13,50 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<RelativeLayout

<LinearLayout

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

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

    android:id="@+id/search_panel"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@drawable/search_panel_list_background">

    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/layout_results"

        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"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/search_bar_margin"

            app:cardCornerRadius="2dp"

            app:cardBackgroundColor="?android:attr/colorBackground"

            app:cardElevation="2dp">

            <Toolbar

                android:id="@+id/search_toolbar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

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

                android:contentInsetStart="0dp"

                android:contentInsetStartWithNavigation="0dp"

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

                <SearchView

                    android:id="@+id/search_view"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

        android:layout_above="@id/feedback_popup"

                    android:iconifiedByDefault="false"

                    android:imeOptions="actionSearch|flagNoExtractUi"

                    android:searchIcon="@null"/>

            </Toolbar>

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

    </FrameLayout>



    <FrameLayout

        android:id="@+id/layout_results"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:orientation="vertical">



        <!-- Padding is included in the background -->
@@ -68,27 +99,8 @@ 


        </LinearLayout>



        <android.support.v7.widget.CardView

            android:id="@+id/search_bar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/search_bar_margin"

            app:cardCornerRadius="2dp"

            app:cardBackgroundColor="?android:attr/colorBackground"

            app:cardElevation="2dp">



            <SearchView

                android:id="@+id/search_view"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:iconifiedByDefault="false"

                android:imeOptions="actionSearch|flagNoExtractUi"

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



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



    </FrameLayout>



    <include layout="@layout/search_feedback"/>



</RelativeLayout>
 
</LinearLayout>

src/com/android/settings/search/HeaderDecorator.java

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/*

 * 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.

 */



package com.android.settings.search;



import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.Rect;

import android.support.v7.widget.RecyclerView;

import android.view.View;



import com.android.settings.R;



public class HeaderDecorator extends RecyclerView.ItemDecoration {

    @Override

    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,

            RecyclerView.State state) {

        super.getItemOffsets(outRect, view, parent, state);

        if (parent.getChildAdapterPosition(view) > 0) {

            return;

        }



        Context context = view.getContext();

        TypedArray ta = context.obtainStyledAttributes(new int[]{android.R.attr.actionBarSize});

        outRect.top = ta.getDimensionPixelSize(0, 0);

        ta.recycle();



        outRect.top += 2 * context.getResources().getDimensionPixelSize(R.dimen.search_bar_margin);

    }

}

src/com/android/settings/search/SearchFragment.java

+22 −2
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ import android.view.ViewGroup; 
import android.view.inputmethod.InputMethodManager;

import android.widget.LinearLayout;

import android.widget.SearchView;

import android.widget.TextView;

import android.widget.Toolbar;



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

import com.android.settings.R;
@@ -168,14 +170,32 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O 
        mResultsRecyclerView.setAdapter(mSearchAdapter);

        mResultsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));

        mResultsRecyclerView.addOnScrollListener(mScrollListener);

        mResultsRecyclerView.addItemDecoration(new HeaderDecorator());



        mNoResultsView = view.findViewById(R.id.no_results_layout);



        mSearchView = view.findViewById(R.id.search_view);

        Toolbar toolbar = view.findViewById(R.id.search_toolbar);

        getActivity().setActionBar(toolbar);

        getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);



        mSearchView = toolbar.findViewById(R.id.search_view);

        mSearchView.setQuery(mQuery, false /* submitQuery */);

        mSearchView.setOnQueryTextListener(this);

        mSearchView.requestFocus();



        // Updating internal views inside SearchView was the easiest way to get this too look right.

        // We null-check here so that tests pass since the robotests can't find the internal views.

        TextView searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);

        if (searchText != null) {

            searchText.setTextColor(getContext().getColorStateList(

                    com.android.internal.R.color.text_color_primary));

        }

        View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame);

        if (editFrame != null) {

            ViewGroup.MarginLayoutParams params =

                    (ViewGroup.MarginLayoutParams) editFrame.getLayoutParams();

            params.setMarginStart(0);

            editFrame.setLayoutParams(params);

        }

        return view;

    }

tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
/*

 * 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.

 */



package com.android.settings.search;



import android.graphics.Rect;

import android.support.v7.widget.RecyclerView;

import android.view.View;



import com.android.settings.R;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.any;

import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class HeaderDecoratorTest {

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private View mView;

    @Mock

    private RecyclerView mRecyclerView;

    @Mock

    private RecyclerView.LayoutParams mLayoutParams;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        when(mView.getLayoutParams()).thenReturn(mLayoutParams);

    }



    @Test

    public void testgetItemOffsets_positionZero_headerAdded() {

        HeaderDecorator decorator = new HeaderDecorator();

        Rect outRect = new Rect();

        when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(0);

        when(mView.getContext().obtainStyledAttributes(any(int[].class))

                .getDimensionPixelSize(0, 0)).thenReturn(20);

        when(mView.getContext().getResources().getDimensionPixelSize(R.dimen.search_bar_margin))

                .thenReturn(5);



        decorator.getItemOffsets(outRect, mView, mRecyclerView, null);



        assertThat(outRect).isEqualTo(new Rect(0, 30, 0, 0));

    }



    @Test

    public void testgetItemOffsets_positionGreaterThanZero_noDecoration() {

        HeaderDecorator decorator = new HeaderDecorator();

        Rect outRect = new Rect();

        when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(1);



        decorator.getItemOffsets(outRect, mView, mRecyclerView, null);



        assertThat(outRect).isEqualTo(new Rect(0, 0, 0, 0));

    }

}