Merge "Add search index for support dashboard activity." (9ccd8ab6) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -3013,7 +3013,7 @@
		android:resource="@string/system_dashboard_summary"/>
		</activity>

		<activity android:name=".dashboard.SupportDashboardActivity"
		<activity android:name=".support.SupportDashboardActivity"
		android:label="@string/page_tab_title_support"
		android:icon="@drawable/ic_help"
		android:theme="@android:style/Theme.NoDisplay"

src/com/android/settings/backup/BackupSettingsActivity.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -94,14 +94,12 @@ public class BackupSettingsActivity extends Activity implements Indexable {

		// Add the activity title
		SearchIndexableRaw data = new SearchIndexableRaw(context);
		data.title = context.getResources().getString(R.string.privacy_settings_title);
		data.screenTitle = context.getResources().getString(
		R.string.privacy_settings_title);
		data.keywords = context.getResources().getString(
		R.string.keywords_backup);
		data.title = context.getString(R.string.privacy_settings_title);
		data.screenTitle = context.getString(R.string.settings_label);
		data.keywords = context.getString(R.string.keywords_backup);
		data.intentTargetPackage = context.getPackageName();
		data.intentTargetClass = BackupSettingsActivity.class.getName();
		data.intentAction = "android.intent.action.MAIN";
		data.intentAction = Intent.ACTION_MAIN;
		data.key = BACKUP_SEARCH_INDEX_KEY;
		result.add(data);

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@ import com.android.settings.DateTimeSettings;
		import com.android.settings.DeviceAdminSettings;
		import com.android.settings.DeviceInfoSettings;
		import com.android.settings.DisplaySettings;
		import com.android.settings.dashboard.SupportDashboardActivity;
		import com.android.settings.dream.DreamSettings;
		import com.android.settings.IccLockSettings;
		import com.android.settings.MasterClear;
		import com.android.settings.PrivacySettings;
		@@ -74,6 +72,7 @@ import com.android.settings.deviceinfo.Status;
		import com.android.settings.deviceinfo.StorageDashboardFragment;
		import com.android.settings.deviceinfo.StorageSettings;
		import com.android.settings.display.NightDisplaySettings;
		import com.android.settings.dream.DreamSettings;
		import com.android.settings.enterprise.EnterprisePrivacySettings;
		import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
		import com.android.settings.fuelgauge.BatterySaverSettings;
		@@ -114,6 +113,7 @@ import com.android.settings.print.PrintJobSettingsFragment;
		import com.android.settings.print.PrintSettingsFragment;
		import com.android.settings.security.LockscreenDashboardFragment;
		import com.android.settings.sim.SimSettings;
		import com.android.settings.support.SupportDashboardActivity;
		import com.android.settings.system.ResetDashboardFragment;
		import com.android.settings.system.SystemDashboardFragment;
		import com.android.settings.tts.TextToSpeechSettings;

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import com.android.settings.backup.BackupSettingsFragment;
		import com.android.settings.bluetooth.BluetoothSettings;
		import com.android.settings.bluetooth.BluetoothSettingsObsolete;
		import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
		import com.android.settings.support.SupportDashboardActivity;
		import com.android.settings.datausage.DataUsageMeteredSettings;
		import com.android.settings.datausage.DataUsageSummary;
		import com.android.settings.development.DevelopmentSettings;
		@@ -55,12 +56,12 @@ import com.android.settings.fuelgauge.BatterySaverSettings;
		import com.android.settings.fuelgauge.PowerUsageAdvanced;
		import com.android.settings.fuelgauge.PowerUsageSummary;
		import com.android.settings.gestures.AssistGestureSettings;
		import com.android.settings.gestures.CameraLiftTriggerSettings;
		import com.android.settings.gestures.DoubleTapPowerSettings;
		import com.android.settings.gestures.DoubleTapScreenSettings;
		import com.android.settings.gestures.DoubleTwistGestureSettings;
		import com.android.settings.gestures.PickupGestureSettings;
		import com.android.settings.gestures.SwipeToNotificationSettings;
		import com.android.settings.gestures.CameraLiftTriggerSettings;
		import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
		import com.android.settings.inputmethod.PhysicalKeyboardFragment;
		import com.android.settings.inputmethod.VirtualKeyboardFragment;
		@@ -190,6 +191,7 @@ public final class SearchIndexableResources {
		addIndex(ChannelImportanceSettings.class, NO_DATA_RES_ID,
		R.drawable.ic_settings_notifications);
		addIndex(DreamSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
		addIndex(SupportDashboardActivity.class, NO_DATA_RES_ID, R.drawable.ic_help);
		}

		private SearchIndexableResources() {

src/com/android/settings/dashboard/SupportDashboardActivity.java→src/com/android/settings/support/SupportDashboardActivity.java

+89 −0

Original line number	Diff line number	Diff line
		@@ -13,19 +13,28 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings.dashboard;
		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;
		import com.android.settings.Settings.LegacySupportActivity;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.overlay.SupportFeatureProvider;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settings.search.SearchIndexableRaw;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* Trampoline activity that decides which version of support should be shown to the user.
		*/
		public class SupportDashboardActivity extends Activity {
		public class SupportDashboardActivity extends Activity implements Indexable {

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		@@ -41,4 +50,40 @@ public class SupportDashboardActivity extends Activity {
		}
		finish();
		}

		/**
		* For Search.
		*/
		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		private static final String SUPPORT_SEARCH_INDEX_KEY = "support_dashboard_activity";

		@Override
		public List<SearchIndexableRaw> getRawDataToIndex(Context context,
		boolean enabled) {

		final List<SearchIndexableRaw> result = new ArrayList<>();

		// Add the activity title
		SearchIndexableRaw data = new SearchIndexableRaw(context);
		data.title = context.getString(R.string.page_tab_title_support);
		data.screenTitle = context.getString(R.string.settings_label);
		data.intentTargetPackage = context.getPackageName();
		data.intentTargetClass = SupportDashboardActivity.class.getName();
		data.intentAction = Intent.ACTION_MAIN;
		data.key = SUPPORT_SEARCH_INDEX_KEY;
		result.add(data);

		return result;
		}

		@Override
		public List<String> getNonIndexableKeys(Context context) {
		final List<String> keys = super.getNonIndexableKeys(context);
		if (!context.getResources().getBoolean(R.bool.config_support_enabled)) {
		keys.add(SUPPORT_SEARCH_INDEX_KEY);
		}
		return keys;
		}
		};
		}