Merge "Add master audio balance setting" (dc1db1c2) · Commits · e / os / android_packages_apps_Settings

res/layout/preference_balance_slider.xml

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeightSmall"
		android:gravity="center_vertical"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:clickable="false"
		android:orientation="horizontal">

		<LinearLayout
		android:id="@+id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="56dp"
		android:gravity="start\|center_vertical"
		android:orientation="horizontal"
		android:paddingEnd="12dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp">
		<com.android.internal.widget.PreferenceImageView
		android:id="@android:id/icon"
		android:layout_width="24dp"
		android:layout_height="24dp"/>
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_marginTop="8dp"
		android:layout_marginBottom="8dp">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TextView
		android:id="@android:id/title"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:singleLine="true"
		android:textAppearance="@*android:style/TextAppearance.Material.Subhead"
		android:textColor="?android:attr/textColorPrimary"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"/>
		<LinearLayout
		android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="center_vertical"
		android:orientation="vertical"/>
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<com.android.settings.accessibility.BalanceSeekBar
		android:id="@*android:id/seekbar"
		android:layout_gravity="center_vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:orientation="horizontal">
		<TextView
		android:id="@+id/left_text"
		android:text="@string/accessibility_toggle_master_balance_left_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:maxLines="1"
		android:textAlignment="viewStart" />
		<TextView
		android:id="@+id/right_text"
		android:text="@string/accessibility_toggle_master_balance_right_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:maxLines="1"
		android:textAlignment="viewEnd" />

		</LinearLayout>
		</LinearLayout>
		</LinearLayout>

		</LinearLayout>

res/values/dimens.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,9 @@

		<dimen name="volume_seekbar_side_margin">8dip</dimen>

		<dimen name="balance_seekbar_center_marker_height">14dp</dimen>
		<dimen name="balance_seekbar_center_marker_width">1dp</dimen>

		<dimen name="crypt_clock_size">100sp</dimen>

		<dimen name="divider_height">3dip</dimen>

res/values/strings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -4717,6 +4717,12 @@
		<string name="accessibility_toggle_master_mono_title">Mono audio</string>
		<!-- Summary for the accessibility preference for master mono. [CHAR LIMIT=50] -->
		<string name="accessibility_toggle_master_mono_summary">Combine channels when playing audio</string>
		<!-- Title for the accessibility preference for master balance. [CHAR LIMIT=35] -->
		<string name="accessibility_toggle_master_balance_title">Audio balance</string>
		<!-- 'Left' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
		<string name="accessibility_toggle_master_balance_left_label">Left</string>
		<!-- 'Right' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
		<string name="accessibility_toggle_master_balance_right_label">Right</string>

		<!-- Option heading to leave the timeout requirement for accessibility users at its default level. [CHAR LIMIT=35] -->
		<string name="accessibility_timeout_default">Default</string>

res/xml/accessibility_settings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,10 @@
		android:summary="@string/accessibility_toggle_master_mono_summary"
		android:persistent="false"/>

		<com.android.settings.accessibility.BalanceSeekBarPreference
		android:key="seekbar_master_balance"
		android:title="@string/accessibility_toggle_master_balance_title" />

		<Preference
		android:key="hearing_aid_preference"
		android:summary="@string/accessibility_hearingaid_not_connected_summary"

src/com/android/settings/accessibility/BalanceSeekBar.java

0 → 100644

+152 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 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 android.content.Context;
		import android.content.res.ColorStateList;
		import android.content.res.Resources;
		import android.graphics.Canvas;
		import android.graphics.Color;
		import android.graphics.Paint;
		import android.graphics.Rect;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.util.AttributeSet;
		import android.widget.SeekBar;

		import com.android.settings.R;

		/**
		* A custom seekbar for the balance setting.
		*
		* Adds a center line indicator between left and right, which snaps to if close.
		* Updates Settings.System for balance on progress changed.
		*/
		public class BalanceSeekBar extends SeekBar {
		private static final String TAG = "BalanceSeekBar";
		private final Context mContext;
		private final Object mListenerLock = new Object();
		private OnSeekBarChangeListener mOnSeekBarChangeListener;
		private final OnSeekBarChangeListener mProxySeekBarListener = new OnSeekBarChangeListener() {
		@Override
		public void onStopTrackingTouch(SeekBar seekBar) {
		synchronized(mListenerLock) {
		if (mOnSeekBarChangeListener != null) {
		mOnSeekBarChangeListener.onStopTrackingTouch(seekBar);
		}
		}
		}

		@Override
		public void onStartTrackingTouch(SeekBar seekBar) {
		synchronized(mListenerLock) {
		if (mOnSeekBarChangeListener != null) {
		mOnSeekBarChangeListener.onStartTrackingTouch(seekBar);
		}
		}
		}

		@Override
		public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
		if (fromUser) {
		// Snap to centre when within the specified threshold
		if (progress != mCenter
		&& progress > mCenter - mSnapThreshold
		&& progress < mCenter + mSnapThreshold) {
		progress = mCenter;
		seekBar.setProgress(progress); // direct update (fromUser becomes false)
		}
		final float balance = (progress - mCenter) * 0.01f;
		Settings.System.putFloatForUser(mContext.getContentResolver(),
		Settings.System.MASTER_BALANCE, balance, UserHandle.USER_CURRENT);
		}
		// If fromUser is false, the call is a set from the framework on creation or on
		// internal update. The progress may be zero, ignore (don't change system settings).

		// after adjusting the seekbar, notify downstream listener.
		// note that progress may have been adjusted in the code above to mCenter.
		synchronized(mListenerLock) {
		if (mOnSeekBarChangeListener != null) {
		mOnSeekBarChangeListener.onProgressChanged(seekBar, progress, fromUser);
		}
		}
		}
		};

		// Percentage of max to be used as a snap to threshold
		private static final float SNAP_TO_PERCENTAGE = 0.03f;
		private final Paint mCenterMarkerPaint;
		private final Rect mCenterMarkerRect;
		// changed in setMax()
		private float mSnapThreshold;
		private int mCenter;

		public BalanceSeekBar(Context context, AttributeSet attrs) {
		this(context, attrs, com.android.internal.R.attr.seekBarStyle);
		}

		public BalanceSeekBar(Context context, AttributeSet attrs, int defStyleAttr) {
		this(context, attrs, defStyleAttr, 0 /* defStyleRes */);
		}

		public BalanceSeekBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		mContext = context;
		Resources res = getResources();
		mCenterMarkerRect = new Rect(0 /* left /, 0 / top */,
		res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_width),
		res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_height));
		mCenterMarkerPaint = new Paint();
		// TODO use a more suitable colour?
		mCenterMarkerPaint.setColor(Color.BLACK);
		mCenterMarkerPaint.setStyle(Paint.Style.FILL);
		// Remove the progress colour
		setProgressTintList(ColorStateList.valueOf(Color.TRANSPARENT));

		super.setOnSeekBarChangeListener(mProxySeekBarListener);
		}

		@Override
		public void setOnSeekBarChangeListener(OnSeekBarChangeListener listener) {
		synchronized(mListenerLock) {
		mOnSeekBarChangeListener = listener;
		}
		}

		// Note: the superclass AbsSeekBar.setMax is synchronized.
		@Override
		public synchronized void setMax(int max) {
		super.setMax(max);
		// update snap to threshold
		mCenter = max / 2;
		mSnapThreshold = max * SNAP_TO_PERCENTAGE;
		}

		// Note: the superclass AbsSeekBar.onDraw is synchronized.
		@Override
		protected synchronized void onDraw(Canvas canvas) {
		// Draw a vertical line at 50% that represents centred balance
		int seekBarCenter = (canvas.getHeight() - getPaddingBottom()) / 2;
		canvas.save();
		canvas.translate((canvas.getWidth() - mCenterMarkerRect.right) / 2,
		seekBarCenter - (mCenterMarkerRect.bottom / 2));
		canvas.drawRect(mCenterMarkerRect, mCenterMarkerPaint);
		canvas.restore();
		super.onDraw(canvas);
		}
		}