Snap for 4773106 from 7e31e22f572cf8a32ebe0d392b1ea4415c02e9fe to pi-release (673ba5d0) · Commits · e / os / android_packages_apps_Settings

res/layout/two_state_button.xml

+4 −8

Original line number	Diff line number	Diff line
		@@ -27,19 +27,15 @@
		<Button
		android:id="@+id/state_on_button"
		style="@style/ActionPrimaryButton"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:paddingEnd="8dp" />
		android:layout_gravity="center" />

		<Button
		android:id="@+id/state_off_button"
		style="@style/ActionSecondaryButton"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:paddingEnd="8dp" />
		android:layout_gravity="center" />

		</LinearLayout>
		No newline at end of file

+3 −0

Original line number	Diff line number	Diff line
		@@ -131,4 +131,7 @@
		<!-- List of a11y components on the device allowed to be enabled by Settings Slices -->
		<string-array name="config_settings_slices_accessibility_components" translatable="false"/>

		<!-- Whether or not swipe up gesture's opt-in setting is available on this device -->
		<bool name="config_swipe_up_gesture_setting_available">false</bool>

		</resources>

+1 −1

Original line number	Diff line number	Diff line
		@@ -9199,7 +9199,7 @@
		<!-- Informational text about time left in billing cycle [CHAR LIMIT=60] -->
		<string name="billing_cycle_less_than_one_day_left">Less than 1 day left</string>

		<!-- Informational text about carrier and update time [CHAR LIMIT=30] -->
		<!-- Informational text about carrier and update time [CHAR LIMIT=32] -->
		<string name="carrier_and_update_text">Updated by <xliff:g name="carrier" example="T-mobile">^1</xliff:g> <xliff:g name="time" example="3m">^2</xliff:g> ago</string>

		<!-- Informational text about update time only, without carrier. First argument intentionally skipped. [CHAR LIMIT=30] -->

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.content.Context;
		import android.provider.Settings;
		import android.view.accessibility.AccessibilityManager;

		import com.android.settings.accessibility.AccessibilitySettings;
		import com.android.settings.core.TogglePreferenceController;
		import com.android.settingslib.accessibility.AccessibilityUtils;

		@@ -88,7 +87,7 @@ public class AccessibilitySlicePreferenceController extends TogglePreferenceCont
		@Override
		public int getAvailabilityStatus() {
		// Return unsupported when the service is disabled or not installed.
		return getAccessibilityServiceInfo() == null ? DISABLED_UNSUPPORTED : AVAILABLE;
		return getAccessibilityServiceInfo() == null ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
		}

		private AccessibilityServiceInfo getAccessibilityServiceInfo() {

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public class MagnificationNavbarPreferenceController extends BasePreferenceContr
		public int getAvailabilityStatus() {
		return MagnificationPreferenceFragment.isApplicable(mContext.getResources())
		? AVAILABLE
		: DISABLED_UNSUPPORTED;
		: UNSUPPORTED_ON_DEVICE;
		}

		@Override