Merge "Add first inline switch result." (9ccd30f1) · Commits · e / os / android_packages_apps_Settings

res/layout/search_inline_switch_item.xml

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2016 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/listPreferredItemHeight"
		android:gravity="center_vertical"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:background="?android:attr/selectableItemBackground"
		android:clipToPadding="false">

		<LinearLayout
		android:id="@+id/icon_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="60dp"
		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="wrap_content"
		android:layout_height="wrap_content"
		android:maxWidth="48dp"
		android:maxHeight="48dp"/>
		</LinearLayout>

		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:paddingTop="16dp"
		android:paddingBottom="16dp">

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:ellipsize="marquee"/>

		<TextView
		android:id="@android:id/summary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@android:id/title"
		android:layout_alignStart="@android:id/title"
		android:textAppearance="?android:attr/textAppearanceListItemSecondary"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLength="60"
		android:maxLines="10"/>

		</RelativeLayout>

		<Switch
		android:id="@+id/switchView"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="end\|center_vertical"
		android:paddingStart="16dp"
		android:orientation="vertical"/>
		</LinearLayout>
		No newline at end of file

res/layout/search_intent_item.xml

+46 −37

Original line number	Diff line number	Diff line
		@@ -14,50 +14,59 @@
		limitations under the License.
		-->

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

		<LinearLayout
		android:id="@+id/icon_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="60dp"
		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="wrap_content"
		android:layout_height="match_parent"
		android:gravity="center"
		android:orientation="horizontal">

		<ImageView
		android:id="@+id/icon"
		android:layout_width="@dimen/search_result_item_image_size"
		android:layout_height="@dimen/search_result_item_image_size"
		android:layout_marginStart="@dimen/search_result_item_image_margin_start"
		android:layout_marginEnd="@dimen/search_result_item_image_margin_end"
		android:scaleType="centerInside"/>
		android:layout_height="wrap_content"
		android:maxWidth="48dp"
		android:maxHeight="48dp"/>
		</LinearLayout>

		<LinearLayout
		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingTop="10dp"
		android:orientation="vertical">
		android:layout_weight="1"
		android:paddingTop="16dp"
		android:paddingBottom="16dp">

		<TextView android:id="@+id/title"
		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal" />
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:ellipsize="marquee"/>

		<TextView android:id="@+id/summary"
		<TextView
		android:id="@android:id/summary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal" />

		</LinearLayout>
		android:layout_below="@android:id/title"
		android:layout_alignStart="@android:id/title"
		android:textAppearance="?android:attr/textAppearanceListItemSecondary"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="10"/>

		</RelativeLayout>
		</LinearLayout>

src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -20,7 +20,10 @@ import android.content.Context;
		import android.provider.Settings;
		import android.support.v7.preference.Preference;

		import android.util.ArrayMap;
		import com.android.settings.core.lifecycle.Lifecycle;
		import com.android.settings.search2.InlineSwitchPayload;
		import com.android.settings.search2.ResultPayload;

		public class DoubleTapPowerPreferenceController extends GesturePreferenceController {

		@@ -61,4 +64,14 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
		Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
		return cameraDisabled == 0;
		}

		@Override
		public ResultPayload getResultPayload() {
		ArrayMap<Integer, Boolean> valueMap = new ArrayMap<>();
		valueMap.put(0, true);
		valueMap.put(1, false);

		return new InlineSwitchPayload(Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
		ResultPayload.SettingsSource.SECURE, valueMap);
		}
		}

src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -21,8 +21,11 @@ import android.content.Context;
		import android.provider.Settings;
		import android.support.v7.preference.Preference;

		import android.util.ArrayMap;
		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.settings.core.lifecycle.Lifecycle;
		import com.android.settings.search2.InlineSwitchPayload;
		import com.android.settings.search2.ResultPayload;

		public class DoubleTapScreenPreferenceController extends GesturePreferenceController {

		@@ -67,4 +70,14 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
		protected boolean isSwitchPrefEnabled() {
		return mAmbientConfig.pulseOnDoubleTapEnabled(mUserId);
		}

		@Override
		public ResultPayload getResultPayload() {
		ArrayMap<Integer, Boolean> valueMap = new ArrayMap<>();
		valueMap.put(1, true);
		valueMap.put(0, false);

		return new InlineSwitchPayload(Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP,
		ResultPayload.SettingsSource.SECURE, valueMap);
		}
		}

src/com/android/settings/gestures/DoubleTwistPreferenceController.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -24,8 +24,11 @@ import android.provider.Settings;
		import android.support.v7.preference.Preference;
		import android.text.TextUtils;

		import android.util.ArrayMap;
		import com.android.settings.R;
		import com.android.settings.core.lifecycle.Lifecycle;
		import com.android.settings.search2.InlineSwitchPayload;
		import com.android.settings.search2.ResultPayload;

		public class DoubleTwistPreferenceController extends GesturePreferenceController {

		@@ -82,4 +85,14 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
		}
		return false;
		}

		@Override
		public ResultPayload getResultPayload() {
		ArrayMap<Integer, Boolean> valueMap = new ArrayMap<>();
		valueMap.put(1, true);
		valueMap.put(0, false);

		return new InlineSwitchPayload(Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED,
		ResultPayload.SettingsSource.SECURE, valueMap);
		}
		}