Apply a11y screen to glif layout
Screenshot: https://hsv.googleplex.com/5745610682531840 Test: atest Bug: 126065441 Change-Id: I31f39d5d78a80e6badb92a4e79df261eeeeaa4d4
This commit is contained in:
@@ -1382,7 +1382,7 @@
|
|||||||
<activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
|
<activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
|
||||||
android:icon="@drawable/ic_accessibility_suggestion"
|
android:icon="@drawable/ic_accessibility_suggestion"
|
||||||
android:label="@string/vision_settings_title"
|
android:label="@string/vision_settings_title"
|
||||||
android:theme="@style/SetupWizardAccessibilityTheme">
|
android:theme="@style/GlifTheme.Light">
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
<action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
|
<action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
@@ -23,13 +23,19 @@ import android.content.Context;
|
|||||||
import android.content.pm.ServiceInfo;
|
import android.content.pm.ServiceInfo;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
import android.view.accessibility.AccessibilityManager;
|
import android.view.accessibility.AccessibilityManager;
|
||||||
|
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.SettingsPreferenceFragment;
|
import com.android.settings.SettingsPreferenceFragment;
|
||||||
|
|
||||||
|
import com.google.android.setupdesign.GlifPreferenceLayout;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -63,6 +69,23 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
|
|||||||
return SettingsEnums.SUW_ACCESSIBILITY;
|
return SettingsEnums.SUW_ACCESSIBILITY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
|
GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
|
||||||
|
layout.setDividerInsets(Integer.MAX_VALUE, 0);
|
||||||
|
|
||||||
|
layout.setHeaderText(R.string.vision_settings_title);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
|
||||||
|
return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle icicle) {
|
public void onCreate(Bundle icicle) {
|
||||||
super.onCreate(icicle);
|
super.onCreate(icicle);
|
||||||
|
@@ -33,14 +33,6 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
|
|||||||
|
|
||||||
private static final String SAVE_KEY_TITLE = "activity_title";
|
private static final String SAVE_KEY_TITLE = "activity_title";
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedState) {
|
|
||||||
super.onCreate(savedState);
|
|
||||||
|
|
||||||
// Finish configuring the content view.
|
|
||||||
getActionBar().setDisplayHomeAsUpEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onSaveInstanceState(Bundle savedState) {
|
protected void onSaveInstanceState(Bundle savedState) {
|
||||||
savedState.putCharSequence(SAVE_KEY_TITLE, getTitle());
|
savedState.putCharSequence(SAVE_KEY_TITLE, getTitle());
|
||||||
|
@@ -0,0 +1,44 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 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 static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
|
||||||
|
import androidx.test.filters.SmallTest;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.robolectric.Robolectric;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
@SmallTest
|
||||||
|
public class AccessibilitySettingsForSetupWizardActivityTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void createSetupAccessibilityActivity_shouldBeSUWTheme() {
|
||||||
|
final Intent intent = new Intent();
|
||||||
|
AccessibilitySettingsForSetupWizardActivity activity =
|
||||||
|
Robolectric.buildActivity(AccessibilitySettingsForSetupWizardActivity.class, intent).get();
|
||||||
|
|
||||||
|
assertThat(activity.getThemeResId()).isEqualTo(R.style.GlifTheme_Light);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user