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

Commit 5336f758 authored by Chris Antol's avatar Chris Antol Committed by Android (Google) Code Review
Browse files

Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev

parents ba74d655 b8ed22bb
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package com.android.settings.support;

import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;

import com.android.settings.R;
@@ -37,6 +36,9 @@ import java.util.List;
@SearchIndexable
public class SupportDashboardActivity extends Activity implements Indexable {

    public static final String ACTION_SUPPORT_SETTINGS =
            "com.android.settings.action.SUPPORT_SETTINGS";

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -70,7 +72,7 @@ public class SupportDashboardActivity extends Activity implements Indexable {
                    data.summaryOn = context.getString(R.string.support_summary);
                    data.intentTargetPackage = context.getPackageName();
                    data.intentTargetClass = SupportDashboardActivity.class.getName();
                    data.intentAction = Intent.ACTION_MAIN;
                    data.intentAction = ACTION_SUPPORT_SETTINGS;
                    data.key = SUPPORT_SEARCH_INDEX_KEY;
                    result.add(data);

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@

package com.android.settings.support;

import static com.android.settings.support.SupportDashboardActivity.ACTION_SUPPORT_SETTINGS;

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

import android.content.Context;
@@ -59,7 +61,7 @@ public class SupportDashboardActivityTest {
                mContext.getString(R.string.page_tab_title_support));
        assertThat(value.intentTargetPackage).isEqualTo(mContext.getPackageName());
        assertThat(value.intentTargetClass).isEqualTo(SupportDashboardActivity.class.getName());
        assertThat(value.intentAction).isEqualTo(Intent.ACTION_MAIN);
        assertThat(value.intentAction).isEqualTo(ACTION_SUPPORT_SETTINGS);
    }

    @Test