Merge "Implement temporary asset in settings page" into sc-dev
This commit is contained in:
TreeHugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
48f6ec410e
45
res/drawable/one_handed_guideline.xml
Normal file
45
res/drawable/one_handed_guideline.xml
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:aapt="http://schemas.android.com/aapt"
|
||||||
|
android:width="412dp"
|
||||||
|
android:height="264dp"
|
||||||
|
android:viewportWidth="412"
|
||||||
|
android:viewportHeight="264">
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M0,0h412v264h-412z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M126,-246C109.431,-246 96,-232.569 96,-216V195C96,211.569 109.431,225 126,225H284.5C301.069,225 314.5,211.569 314.5,195V-216C314.5,-232.569 301.069,-246 284.5,-246H126ZM122,-235C110.954,-235 102,-226.046 102,-215V189.5C102,200.546 110.954,209.5 122,209.5H288C299.046,209.5 308,200.546 308,189.5V-215C308,-226.046 299.046,-235 288,-235H122Z"
|
||||||
|
android:fillColor="#000000"
|
||||||
|
android:fillType="evenOdd"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M122.12,-233L288.12,-233A20,20 0,0 1,308.12 -213L308.12,191.5A20,20 0,0 1,288.12 211.5L122.12,211.5A20,20 0,0 1,102.12 191.5L102.12,-213A20,20 0,0 1,122.12 -233z"
|
||||||
|
android:fillColor="#EAF1FF"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M102.16,193.12H308.08C308.08,203.326 299.806,211.6 289.6,211.6H120.64C110.434,211.6 102.16,203.326 102.16,193.12Z"
|
||||||
|
android:fillColor="#B5CFFC"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M187.5,202.72L222.5,202.72A0.5,0.5 0,0 1,223 203.22L223,203.22A0.5,0.5 0,0 1,222.5 203.72L187.5,203.72A0.5,0.5 0,0 1,187 203.22L187,203.22A0.5,0.5 0,0 1,187.5 202.72z"
|
||||||
|
android:fillColor="#666666"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M197,115h36v94.684h-36z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillAlpha="0.8">
|
||||||
|
<aapt:attr name="android:fillColor">
|
||||||
|
<gradient
|
||||||
|
android:startY="189.19"
|
||||||
|
android:startX="212.951"
|
||||||
|
android:endY="168.637"
|
||||||
|
android:endX="212.447"
|
||||||
|
android:type="linear">
|
||||||
|
<item android:offset="0" android:color="#FF4285F4"/>
|
||||||
|
<item android:offset="1" android:color="#004385F5"/>
|
||||||
|
</gradient>
|
||||||
|
</aapt:attr>
|
||||||
|
</path>
|
||||||
|
<path
|
||||||
|
android:pathData="M197,206.899a18,18.101 0,1 0,36 0a18,18.101 0,1 0,-36 0z"
|
||||||
|
android:strokeAlpha="0.8"
|
||||||
|
android:fillColor="#3B7BE4"
|
||||||
|
android:fillAlpha="0.8"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
29
res/layout/one_handed_header.xml
Normal file
29
res/layout/one_handed_header.xml
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2021 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
android:cropToPadding="true"
|
||||||
|
android:src="@drawable/one_handed_guideline"
|
||||||
|
android:contentDescription="@null" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -21,6 +21,14 @@
|
|||||||
android:persistent="false"
|
android:persistent="false"
|
||||||
android:title="@string/one_handed_title">
|
android:title="@string/one_handed_title">
|
||||||
|
|
||||||
|
<com.android.settingslib.widget.LayoutPreference
|
||||||
|
android:key="one_handed_header"
|
||||||
|
android:layout="@layout/one_handed_header"
|
||||||
|
android:persistent="false"
|
||||||
|
android:selectable="false"
|
||||||
|
settings:allowDividerBelow="false"
|
||||||
|
settings:searchable="false"/>
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="gesture_one_handed_mode_enabled"
|
android:key="gesture_one_handed_mode_enabled"
|
||||||
android:title="@string/one_handed_mode_enabled"
|
android:title="@string/one_handed_mode_enabled"
|
||||||
|
|||||||
Reference in New Issue
Block a user