PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 8485504 from 8c78bad4e6 to tm-release

Browse Source 
Change-Id: I1b250a30b21bfa108b1673e139925fea76ce559f
This commit is contained in:
Android Build Coastguard Worker
2022-04-22 01:09:34 +00:00
parent 82c9c76e51 8c78bad4e6
commit 13fbddb9db
9 changed files with 232 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/accessibility_text_reading_reset_button.xml
View File

@@ -27,14 +27,11 @@
android:id="@+id/reset_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center|end"
android:layout_gravity="center_vertical|start"
android:paddingVertical="14dp"
android:background="@null"
android:drawableStart="@drawable/ic_history"
android:drawablePadding="9dp"
android:drawableTint="?android:attr/colorAccent"
android:textColor="?android:attr/colorAccent"
android:textSize="16sp"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/accessibility_text_reading_reset_button_title"/>
android:drawableTint="@color/settingslib_btn_colored_text_material"
android:text="@string/accessibility_text_reading_reset_button_title"
style="@style/ActionPrimaryButton"/>
</FrameLayout>

1
res/layout/icon_discrete_slider.xml
View File

@@ -19,6 +19,7 @@
android:id="@+id/seekbar_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:background="?android:colorBackground"
android:gravity="center_vertical">

2
res/values-land/dimens.xml
View File

@@ -18,8 +18,6 @@
<dimen name="appwidget_width">421dip</dimen>
<dimen name="appwidget_height">68dip</dimen>
<dimen name="captioning_preview_height">100dp</dimen>
<!-- ActionBar height -->
<dimen name="actionbar_size">46dip</dimen>

2
res/values-sw600dp-land/dimens.xml
View File

@@ -19,8 +19,6 @@
<dimen name="screen_margin_top">72dip</dimen>
<dimen name="screen_margin_bottom">48dip</dimen>
<dimen name="captioning_preview_height">150dp</dimen>
<dimen name="confirm_credentials_top_padding">20dp</dimen>
<dimen name="confirm_credentials_top_margin">24dp</dimen>

2
res/values/dimens.xml
View File

@@ -49,7 +49,7 @@
<dimen name="pager_tabs_title_padding">16dp</dimen>
<dimen name="pager_tabs_selected_indicator_height">3dp</dimen>
<dimen name="captioning_preview_height">200dp</dimen>
<dimen name="captioning_preview_height">300dp</dimen>
<dimen name="autoclick_preview_height">200dp</dimen>

4
res/xml/accessibility_text_reading_options.xml
View File

@@ -27,7 +27,7 @@
<com.android.settings.widget.LabeledSeekBarPreference
android:key="font_size"
android:selectable="false"
android:selectable="true"
android:summary="@string/short_summary_font_size"
android:title="@string/title_font_size"
settings:iconEnd="@drawable/ic_add_24dp"
@@ -38,7 +38,7 @@
<com.android.settings.widget.LabeledSeekBarPreference
android:key="display_size"
android:selectable="false"
android:selectable="true"
android:summary="@string/screen_zoom_short_summary"
android:title="@string/screen_zoom_title"
settings:iconEnd="@drawable/ic_add_24dp"

13
src/com/android/settings/accessibility/CaptionAppearanceFragment.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.accessibility;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
@@ -400,6 +402,7 @@ public class CaptionAppearanceFragment extends DashboardFragment
}
refreshPreviewText();
enableCaptioningManager();
}
@Override
@@ -409,16 +412,26 @@ public class CaptionAppearanceFragment extends DashboardFragment
Settings.Secure.putString(
cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_TYPEFACE, (String) value);
refreshPreviewText();
enableCaptioningManager();
} else if (mFontSize == preference) {
Settings.Secure.putFloat(
cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_FONT_SCALE,
Float.parseFloat((String) value));
refreshPreviewText();
enableCaptioningManager();
}
return true;
}
private void enableCaptioningManager() {
if (mCaptioningManager.isEnabled()) {
return;
}
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, ON);
}
@Override
public int getHelpResource() {
return R.string.help_url_caption;

100
src/com/android/settings/network/helper/LifecycleCallbackAdapter.java Normal file
View File

@@ -0,0 +1,100 @@
/*
* Copyright (C) 2022 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.network.helper;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleEventObserver;
import androidx.lifecycle.LifecycleOwner;
import java.util.concurrent.atomic.AtomicReference;
/**
* A {@link androidx.lifecycle.LifecycleObserver} implementation of adapter over callback.
*
* Which including:
* 1. Request to active callback when Lifecycle.State.STARTED
* 2. Request to inactive callback when Lifecycle.State.STOPPED
* 3. Close (no further resume) when Lifecycle.State.DESTROYED
*/
@VisibleForTesting
abstract class LifecycleCallbackAdapter implements LifecycleEventObserver, AutoCloseable {
private static final String TAG = "LifecycleCallbackAdapter";
private AtomicReference<Lifecycle> mLifecycle = new AtomicReference<Lifecycle>();
/**
* Constructor
* @param lifecycle {@link Lifecycle} to monitor
*/
@VisibleForTesting
protected LifecycleCallbackAdapter(@NonNull Lifecycle lifecycle) {
mLifecycle.set(lifecycle);
lifecycle.addObserver(this);
}
/**
* Get {@link Lifecycle} under monitor.
* @return {@link Lifecycle}. Return {@code null} when closed.
*/
@VisibleForTesting
public Lifecycle getLifecycle() {
return mLifecycle.get();
}
/**
* Check current callback status.
* @return true when callback is active.
*/
public abstract boolean isCallbackActive();
/**
* Change callback status.
* @param isActive true to active callback, otherwise inactive.
*/
public abstract void setCallbackActive(boolean isActive);
/**
* Implementation of LifecycleEventObserver.
*/
public void onStateChanged(LifecycleOwner source, Lifecycle.Event event) {
if (mLifecycle.get() == null) {
return;
}
Lifecycle.State state = event.getTargetState();
boolean expectCallbackActive = state.isAtLeast(Lifecycle.State.STARTED);
if (expectCallbackActive != isCallbackActive()) {
setCallbackActive(expectCallbackActive);
}
if (state == Lifecycle.State.DESTROYED) {
close();
}
}
/**
* Implementation of AutoCloseable.
*/
@MainThread
public void close() {
Lifecycle lifecycle = mLifecycle.getAndSet(null);
if (lifecycle != null) {
lifecycle.removeObserver(this);
}
}
}

111
tests/unit/src/com/android/settings/network/helper/LifecycleCallbackAdapterTest.java Normal file
View File

@@ -0,0 +1,111 @@
/*
* Copyright (C) 2022 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.network.helper;
import static com.google.common.truth.Truth.assertThat;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LifecycleRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class LifecycleCallbackAdapterTest implements LifecycleOwner {
private final LifecycleRegistry mRegistry = LifecycleRegistry.createUnsafe(this);
private TestObj mTarget;
@Before
public void setUp() {
mTarget = new TestObj(getLifecycle());
}
public Lifecycle getLifecycle() {
return mRegistry;
}
@Test
public void lifecycle_get_lifecycleToMonitor() {
assertThat(mTarget.getLifecycle()).isEqualTo(mRegistry);
}
@Test
public void lifecycle_stateChangeToStart_callbackActive() {
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
assertThat(mTarget.getCallbackCount()).isEqualTo(0);
assertThat(mTarget.isCallbackActive()).isEqualTo(Boolean.FALSE);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
assertThat(mTarget.getCallbackCount()).isEqualTo(1);
assertThat(mTarget.isCallbackActive()).isEqualTo(Boolean.TRUE);
}
@Test
public void lifecycle_stateChangeToStop_callbackInActive() {
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP);
assertThat(mTarget.getCallbackCount()).isEqualTo(2);
assertThat(mTarget.isCallbackActive()).isEqualTo(Boolean.FALSE);
}
@Test
public void lifecycle_stateChangeToDestroy_noFurtherActive() {
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY);
assertThat(mTarget.getCallbackCount()).isEqualTo(2);
assertThat(mTarget.isCallbackActive()).isEqualTo(Boolean.FALSE);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
mRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
assertThat(mTarget.getCallbackCount()).isEqualTo(2);
assertThat(mTarget.isCallbackActive()).isEqualTo(Boolean.FALSE);
}
public static class TestObj extends LifecycleCallbackAdapter {
boolean mIsActive;
int mNumberOfCallback;
public TestObj(Lifecycle lifecycle) {
super(lifecycle);
}
public boolean isCallbackActive() {
return mIsActive;
}
public void setCallbackActive(boolean isActive) {
mIsActive = isActive;
mNumberOfCallback ++;
}
protected int getCallbackCount() {
return mNumberOfCallback;
}
}
}