Add search bar to SearchActivity.

Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
This commit is contained in:
Andrew Sapperstein
2017-05-28 16:28:08 -07:00
parent 14934599dd
commit fac61b71e5
9 changed files with 225 additions and 80 deletions

View File

@@ -93,6 +93,10 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
getPackageName(),
Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
null));
paths.add(new ResourcePath(
getPackageName(),
Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
null));
return paths;
}
};

View File

@@ -0,0 +1,100 @@
/*
* 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.search2;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Loader;
import android.graphics.Rect;
import android.os.Bundle;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.search.IndexingCallback;
import com.android.settings.testutils.FakeFeatureFactory;
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.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ActivityController;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
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));
}
}