Set parent activity for search.
This enables the nav up button from actionbar. Fix: 34176247 Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/search/SearchActivityTest.java Change-Id: I28ef9f1270f5a178346ff9bd9148f7f2035858b2
This commit is contained in:
@@ -218,7 +218,8 @@
|
|||||||
|
|
||||||
<activity android:name=".search2.SearchActivity"
|
<activity android:name=".search2.SearchActivity"
|
||||||
android:label="@string/search_settings"
|
android:label="@string/search_settings"
|
||||||
android:icon="@drawable/ic_search_history">
|
android:icon="@drawable/ic_search_history"
|
||||||
|
android:parentActivityName="Settings">
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<!-- Top-level settings -->
|
<!-- Top-level settings -->
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
* 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.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.content.pm.ResolveInfo;
|
||||||
|
import android.support.test.InstrumentationRegistry;
|
||||||
|
import android.support.test.filters.SmallTest;
|
||||||
|
import android.support.test.runner.AndroidJUnit4;
|
||||||
|
|
||||||
|
import com.android.settings.Settings;
|
||||||
|
import com.android.settings.search2.SearchActivity;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertFalse;
|
||||||
|
|
||||||
|
@SmallTest
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class SearchActivityTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shouldHaveParentActivity() {
|
||||||
|
final Context context = InstrumentationRegistry.getTargetContext();
|
||||||
|
final PackageManager packageManager = context.getPackageManager();
|
||||||
|
final Intent intent = new Intent(context, SearchActivity.class);
|
||||||
|
final List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(
|
||||||
|
intent, PackageManager.GET_META_DATA);
|
||||||
|
|
||||||
|
assertFalse(resolveInfos.isEmpty());
|
||||||
|
assertEquals(Settings.class.getName(), resolveInfos.get(0).activityInfo.parentActivityName);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user