Fix the screen will move by itself when enabled Color correction.
Root Cause: Using the listener to update the UI dynamically might have some time delay. Solution: Refactor to another implementation and avoid using the listener to update it. Additional condition: Add height restriction in preference to avoid the palette view to cover whole screen. Bug: 148785841 Test: make RunSettingsRoboTests ROBOTEST_FILTER=PaletteListPreferenceTest Change-Id: I6a854e16321b3426e2f8ff65c6404036d55caed4
This commit is contained in:
@@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Copyright (C) 2020 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 org.junit.Assert.assertEquals;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import androidx.preference.PreferenceViewHolder;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link PaletteListPreference}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public final class PaletteListPreferenceTest {
|
||||
|
||||
private PaletteListPreference mPaletteListPreference;
|
||||
private PreferenceViewHolder mPreferenceViewHolder;
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
|
||||
@Before
|
||||
public void initObjects() {
|
||||
mPaletteListPreference = new PaletteListPreference(mContext, null);
|
||||
|
||||
final LayoutInflater inflater = LayoutInflater.from(mContext);
|
||||
final View view =
|
||||
inflater.inflate(R.layout.daltonizer_preview, null);
|
||||
mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(view);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void initPaletteView_success() {
|
||||
mPaletteListPreference.onBindViewHolder(mPreferenceViewHolder);
|
||||
|
||||
final ViewGroup viewGroup =
|
||||
mPreferenceViewHolder.itemView.findViewById(R.id.palette_view);
|
||||
final int expectedCount =
|
||||
mContext.getResources().getStringArray(R.array.setting_palette_data).length;
|
||||
assertEquals(expectedCount, viewGroup.getChildCount());
|
||||
}
|
||||
}
|
@@ -1,65 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2020 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.Context;
|
||||
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link PaletteListView} */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class PaletteListViewTest {
|
||||
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private PaletteListView mPaletteListView;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mPaletteListView = new PaletteListView(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setColors_applySameLengthArray_configureSuccessful() {
|
||||
final String[] colorName = {"White", "Black", "Yellow"};
|
||||
final String[] colorCode = {"#ffffff", "#000000", "#f9ab00"};
|
||||
|
||||
assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setColors_applyDifferentLengthArray_configureSuccessful() {
|
||||
final String[] colorName = {"White", "Black", "Yellow", "Orange", "Red"};
|
||||
final String[] colorCode = {"#ffffff", "#000000", "#f9ab00"};
|
||||
|
||||
assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setColors_configureFailed() {
|
||||
final String[] colorName = null;
|
||||
final String[] colorCode = null;
|
||||
|
||||
assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isFalse();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user