Use value-night to give theme instead of directly from intent extra when Setup day/nNight mode enabled and in Setup flow Before: <vision settings> https://hsv.googleplex.com/4837266235064320 <wifi dialog> https://hsv.googleplex.com/5687053981319168 <lock screen with disabling button> https://hsv.googleplex.com/4843506419892224 <lock screen with enabling button> https://hsv.googleplex.com/5650348922372096 <fingerprint intro> https://hsv.googleplex.com/5133769046491136 <fingerprint touch> https://hsv.googleplex.com/5681937198874624 <fingerprint left touch> https://hsv.googleplex.com/5767441676238848 <squeeze release> https://hsv.googleplex.com/6632476812247040 After: <vision settings> https://hsv.googleplex.com/6213298875793408 <wifi dialog> https://hsv.googleplex.com/6025790804197376 <lock screen with disabling button> https://hsv.googleplex.com/5747461219942400 <lock screen with enabling button> https://hsv.googleplex.com/5766700781797376 <fingerprint intro> https://hsv.googleplex.com/6751334529236992 <fingerprint touch> https://hsv.googleplex.com/5625963293442048 <fingerprint left touch> https://hsv.googleplex.com/4518139360444416 <squeeze release> https://hsv.googleplex.com/5220720579706880 Bug: 169734655 Test: robo test Change-Id: I4aab843e28a932c7b823f36f1d8df1e5b2341f4e
134 lines
5.1 KiB
Java
134 lines
5.1 KiB
Java
/*
|
|
* Copyright (C) 2016 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.accessibility;
|
|
|
|
import android.content.ComponentName;
|
|
import android.content.res.Resources;
|
|
import android.os.Bundle;
|
|
import android.util.Log;
|
|
import android.view.Menu;
|
|
import android.view.accessibility.AccessibilityEvent;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
import androidx.preference.Preference;
|
|
import androidx.preference.PreferenceFragmentCompat;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.SettingsActivity;
|
|
import com.android.settings.SetupWizardUtils;
|
|
import com.android.settings.core.SubSettingLauncher;
|
|
import com.android.settings.display.FontSizePreferenceFragmentForSetupWizard;
|
|
import com.android.settings.search.actionbar.SearchMenuController;
|
|
import com.android.settings.support.actionbar.HelpResourceProvider;
|
|
import com.android.settingslib.core.instrumentation.Instrumentable;
|
|
|
|
import com.google.android.setupcompat.util.WizardManagerHelper;
|
|
|
|
public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity {
|
|
|
|
private static final String LOG_TAG = "A11ySettingsForSUW";
|
|
private static final String SAVE_KEY_TITLE = "activity_title";
|
|
|
|
@VisibleForTesting
|
|
static final String CLASS_NAME_FONT_SIZE_SETTINGS_FOR_SUW =
|
|
"com.android.settings.FontSizeSettingsForSetupWizardActivity";
|
|
|
|
@Override
|
|
protected void onSaveInstanceState(Bundle savedState) {
|
|
savedState.putCharSequence(SAVE_KEY_TITLE, getTitle());
|
|
super.onSaveInstanceState(savedState);
|
|
}
|
|
|
|
@Override
|
|
protected void onRestoreInstanceState(Bundle savedState) {
|
|
super.onRestoreInstanceState(savedState);
|
|
setTitle(savedState.getCharSequence(SAVE_KEY_TITLE));
|
|
}
|
|
|
|
@Override
|
|
public boolean onCreateOptionsMenu(Menu menu) {
|
|
// Return true, so we get notified when items in the menu are clicked.
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
public boolean onNavigateUp() {
|
|
onBackPressed();
|
|
|
|
// Clear accessibility focus and let the screen reader announce the new title.
|
|
getWindow().getDecorView()
|
|
.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
|
|
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
|
|
Bundle args = pref.getExtras();
|
|
if (args == null) {
|
|
args = new Bundle();
|
|
}
|
|
args.putInt(HelpResourceProvider.HELP_URI_RESOURCE_KEY, 0);
|
|
args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false);
|
|
new SubSettingLauncher(this)
|
|
.setDestination(pref.getFragment())
|
|
.setArguments(args)
|
|
.setSourceMetricsCategory(caller instanceof Instrumentable
|
|
? ((Instrumentable) caller).getMetricsCategory()
|
|
: Instrumentable.METRICS_CATEGORY_UNKNOWN)
|
|
.launch();
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
protected void onCreate(Bundle savedState) {
|
|
super.onCreate(savedState);
|
|
|
|
tryLaunchFontSizeSettings();
|
|
findViewById(R.id.content_parent).setFitsSystemWindows(false);
|
|
}
|
|
|
|
@VisibleForTesting
|
|
void tryLaunchFontSizeSettings() {
|
|
if (WizardManagerHelper.isAnySetupWizard(getIntent())
|
|
&& new ComponentName(getPackageName(),
|
|
CLASS_NAME_FONT_SIZE_SETTINGS_FOR_SUW).equals(
|
|
getIntent().getComponent())) {
|
|
final Bundle args = new Bundle();
|
|
args.putInt(HelpResourceProvider.HELP_URI_RESOURCE_KEY, 0);
|
|
args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false);
|
|
final SubSettingLauncher subSettingLauncher = new SubSettingLauncher(this)
|
|
.setDestination(FontSizePreferenceFragmentForSetupWizard.class.getName())
|
|
.setArguments(args)
|
|
.setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN)
|
|
.setExtras(SetupWizardUtils.copyLifecycleExtra(getIntent().getExtras(),
|
|
new Bundle()));
|
|
|
|
Log.d(LOG_TAG, "Launch font size settings");
|
|
subSettingLauncher.launch();
|
|
finish();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
|
|
final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
|
|
theme.applyStyle(R.style.SetupWizardPartnerResource, true);
|
|
super.onApplyThemeResource(theme, new_resid, first);
|
|
}
|
|
}
|