1. Move getPreferenceScreenResId() from individual subclass to InstrumentedPreferenceFragment. 2. Removed InstrumentedPreferenceFragment.getTitle() and let the preference fragments that do not have preference screen set the activity title directly instead. 3. Removed OptionsMenuFragment as all it does is call setHasOptionMenu(). - changed subclasses of OptionsMenuFragment to extend from InstrumentedPreferenceFragment directly. - none of the exisitng subclasses actually implements the option menu related methods to provide any option menu. So, the setHasOptionMenu() call is not added to the subclasses. 4. Update Languages preference title. - launch the fragment from the preference controller instead of from the default handling, as we need the title res id at launch time to get it work properly when retrieving the title from back stack. Bug: 64564191 Test: blaze-bin/screenshots/android/i18nscreenshots/i18nscreenshots Change-Id: Ibecdcab32cbaed8bf604ec5ebe0a926b4e489a7d
127 lines
4.7 KiB
Java
127 lines
4.7 KiB
Java
/*
|
|
* Copyright (C) 2015 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.display;
|
|
|
|
import android.annotation.Nullable;
|
|
import android.content.Context;
|
|
import android.content.res.Configuration;
|
|
import android.content.res.Resources;
|
|
import android.os.Bundle;
|
|
import android.view.Display;
|
|
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
|
import com.android.settings.PreviewSeekBarPreferenceFragment;
|
|
import com.android.settings.R;
|
|
import com.android.settings.search.BaseSearchIndexProvider;
|
|
import com.android.settings.search.Indexable;
|
|
import com.android.settings.search.SearchIndexableRaw;
|
|
import com.android.settingslib.display.DisplayDensityUtils;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Preference fragment used to control screen zoom.
|
|
*/
|
|
public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment implements Indexable {
|
|
|
|
private int mDefaultDensity;
|
|
private int[] mValues;
|
|
|
|
@Override
|
|
public void onCreate(@Nullable Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
|
|
mActivityLayoutResId = R.layout.screen_zoom_activity;
|
|
|
|
// This should be replaced once the final preview sample screen is in place.
|
|
mPreviewSampleResIds = new int[]{R.layout.screen_zoom_preview_1,
|
|
R.layout.screen_zoom_preview_2,
|
|
R.layout.screen_zoom_preview_settings};
|
|
|
|
final DisplayDensityUtils density = new DisplayDensityUtils(getContext());
|
|
|
|
final int initialIndex = density.getCurrentIndex();
|
|
if (initialIndex < 0) {
|
|
// Failed to obtain default density, which means we failed to
|
|
// connect to the window manager service. Just use the current
|
|
// density and don't let the user change anything.
|
|
final int densityDpi = getResources().getDisplayMetrics().densityDpi;
|
|
mValues = new int[] { densityDpi };
|
|
mEntries = new String[] { getString(DisplayDensityUtils.SUMMARY_DEFAULT) };
|
|
mInitialIndex = 0;
|
|
mDefaultDensity = densityDpi;
|
|
} else {
|
|
mValues = density.getValues();
|
|
mEntries = density.getEntries();
|
|
mInitialIndex = initialIndex;
|
|
mDefaultDensity = density.getDefaultDensity();
|
|
}
|
|
|
|
if (usePreferenceScreenTitle()) {
|
|
getActivity().setTitle(R.string.screen_zoom_title);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected Configuration createConfig(Configuration origConfig, int index) {
|
|
// Populate the sample layouts.
|
|
final Configuration config = new Configuration(origConfig);
|
|
config.densityDpi = mValues[index];
|
|
return config;
|
|
}
|
|
|
|
/**
|
|
* Persists the selected density and sends a configuration change.
|
|
*/
|
|
@Override
|
|
protected void commit() {
|
|
final int densityDpi = mValues[mCurrentIndex];
|
|
if (densityDpi == mDefaultDensity) {
|
|
DisplayDensityUtils.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);
|
|
} else {
|
|
DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public int getHelpResource() {
|
|
return R.string.help_url_display_size;
|
|
}
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return MetricsEvent.DISPLAY_SCREEN_ZOOM;
|
|
}
|
|
|
|
/** Index provider used to expose this fragment in search. */
|
|
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
|
new BaseSearchIndexProvider() {
|
|
@Override
|
|
public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
|
|
final Resources res = context.getResources();
|
|
final SearchIndexableRaw data = new SearchIndexableRaw(context);
|
|
data.title = res.getString(R.string.screen_zoom_title);
|
|
data.screenTitle = res.getString(R.string.screen_zoom_title);
|
|
data.keywords = res.getString(R.string.screen_zoom_keywords);
|
|
|
|
final List<SearchIndexableRaw> result = new ArrayList<>(1);
|
|
result.add(data);
|
|
return result;
|
|
}
|
|
};
|
|
}
|