Add a suggestion: showing new device features
- New suggestion activity - Removed useless api SuggestionFeatureProvider.isPresent(). - Also updated support activity search indexing icon and summary Change-Id: Ib52cf26a985f57bf0aac918606b10f75bd024639 Fix: 62034077 Fix: 62196070 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -0,0 +1,119 @@
|
||||
/*
|
||||
* 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.support;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.text.TextUtils;
|
||||
import android.text.format.DateUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class NewDeviceIntroSuggestionActivity extends Activity {
|
||||
|
||||
private static final String TAG = "NewDeviceIntroSugg";
|
||||
@VisibleForTesting
|
||||
static final String PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME =
|
||||
"pref_new_device_intro_suggestion_first_display_time_ms";
|
||||
@VisibleForTesting
|
||||
static final String PREF_KEY_SUGGGESTION_COMPLETE =
|
||||
"pref_new_device_intro_suggestion_complete";
|
||||
@VisibleForTesting
|
||||
static final long PERMANENT_DISMISS_THRESHOLD = DateUtils.DAY_IN_MILLIS * 14;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
final Intent intent = getLaunchIntent(this);
|
||||
if (intent != null) {
|
||||
final SuggestionFeatureProvider featureProvider = FeatureFactory.getFactory(this)
|
||||
.getSuggestionFeatureProvider(this);
|
||||
final SharedPreferences prefs = featureProvider.getSharedPrefs(this);
|
||||
prefs.edit().putBoolean(PREF_KEY_SUGGGESTION_COMPLETE, true).commit();
|
||||
startActivity(intent);
|
||||
}
|
||||
finish();
|
||||
}
|
||||
|
||||
public static boolean isSuggestionComplete(Context context) {
|
||||
return isExpired(context) || hasLaunchedBefore(context) || !canOpenUrlInBrowser(context);
|
||||
}
|
||||
|
||||
private static boolean isExpired(Context context) {
|
||||
final SuggestionFeatureProvider featureProvider = FeatureFactory.getFactory(context)
|
||||
.getSuggestionFeatureProvider(context);
|
||||
final SharedPreferences prefs = featureProvider.getSharedPrefs(context);
|
||||
final long currentTimeMs = System.currentTimeMillis();
|
||||
final long firstDisplayTimeMs;
|
||||
|
||||
if (!prefs.contains(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME)) {
|
||||
firstDisplayTimeMs = currentTimeMs;
|
||||
prefs.edit().putLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME, currentTimeMs).commit();
|
||||
} else {
|
||||
firstDisplayTimeMs = prefs.getLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME, -1);
|
||||
}
|
||||
|
||||
final long dismissTimeMs = firstDisplayTimeMs + PERMANENT_DISMISS_THRESHOLD;
|
||||
|
||||
final boolean expired = currentTimeMs > dismissTimeMs;
|
||||
|
||||
Log.d(TAG, "is suggestion expired: " + expired);
|
||||
return expired;
|
||||
}
|
||||
|
||||
private static boolean canOpenUrlInBrowser(Context context) {
|
||||
final Intent intent = getLaunchIntent(context);
|
||||
if (intent == null) {
|
||||
// No url/intent to launch.
|
||||
return false;
|
||||
}
|
||||
// Make sure we can handle the intent.
|
||||
final List<ResolveInfo> resolveInfos =
|
||||
context.getPackageManager().queryIntentActivities(intent, 0);
|
||||
return resolveInfos != null && resolveInfos.size() != 0;
|
||||
}
|
||||
|
||||
private static boolean hasLaunchedBefore(Context context) {
|
||||
final SuggestionFeatureProvider featureProvider = FeatureFactory.getFactory(context)
|
||||
.getSuggestionFeatureProvider(context);
|
||||
final SharedPreferences prefs = featureProvider.getSharedPrefs(context);
|
||||
return prefs.getBoolean(PREF_KEY_SUGGGESTION_COMPLETE, false);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
static Intent getLaunchIntent(Context context) {
|
||||
final String url = context.getString(R.string.new_device_suggestion_intro_url);
|
||||
if (TextUtils.isEmpty(url)) {
|
||||
return null;
|
||||
}
|
||||
return new Intent()
|
||||
.setAction(Intent.ACTION_VIEW)
|
||||
.addCategory(Intent.CATEGORY_BROWSABLE)
|
||||
.setData(Uri.parse(url));
|
||||
}
|
||||
}
|
@@ -68,6 +68,8 @@ public class SupportDashboardActivity extends Activity implements Indexable {
|
||||
SearchIndexableRaw data = new SearchIndexableRaw(context);
|
||||
data.title = context.getString(R.string.page_tab_title_support);
|
||||
data.screenTitle = context.getString(R.string.settings_label);
|
||||
data.summaryOn = context.getString(R.string.support_summary);
|
||||
data.iconResId = R.drawable.ic_help;
|
||||
data.intentTargetPackage = context.getPackageName();
|
||||
data.intentTargetClass = SupportDashboardActivity.class.getName();
|
||||
data.intentAction = Intent.ACTION_MAIN;
|
||||
|
Reference in New Issue
Block a user