release-request-60f1fc0d-1c6d-400a-8b4e-444f1452f036-for-git_oc-mr1-release-41... (050143f5) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+108 −8

Original line number	Diff line number	Diff line
		@@ -2424,6 +2424,18 @@
		android:value="com.android.settings.datausage.DataUsageSummary" />
		</activity>

		<activity android:name="Settings$MobileDataUsageListActivity"
		android:label="@string/cellular_data_usage"
		android:taskAffinity="">
		<intent-filter android:priority="1">
		<action android:name="android.settings.MOBILE_DATA_USAGE" />
		<category android:name="
		android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.datausage.DataUsageList" />
		</activity>

		<activity android:name="Settings$DreamSettingsActivity"
		android:label="@string/screensaver_settings_title"
		android:icon="@drawable/ic_settings_display"
		@@ -3178,10 +3190,9 @@

		<!-- Activities for moves/gestures suggestions -->
		<activity
		android:name=".Settings$CameraLiftTriggerSuggestionActivity"
		android:label="@string/camera_lift_trigger_title"
		android:icon="@drawable/ic_settings_camera"
		android:enabled="@bool/config_cameraLiftTriggerAvailable">
		android:name=".Settings$DoubleTapPowerSuggestionActivity"
		android:label="@string/double_tap_power_for_camera_title"
		android:icon="@drawable/ic_suggestion_gesture">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.GESTURE" />
		@@ -3191,14 +3202,103 @@
		<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
		</intent-filter>
		<meta-data android:name="com.android.settings.dismiss"
		android:value="3,7,30" />
		android:value="4,8,30" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.gestures.DoubleTapPowerSettings"/>
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/double_tap_power_for_camera_suggestion_title" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/double_tap_power_for_camera_suggestion_summary" />
		</activity>

		<activity
		android:name=".Settings$DoubleTwistSuggestionActivity"
		android:label="@string/double_twist_for_camera_mode_title"
		android:icon="@drawable/ic_suggestion_gesture">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.GESTURE" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
		</intent-filter>
		<meta-data android:name="com.android.settings.dismiss"
		android:value="4,8,30" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.gestures.DoubleTwistGestureSettings"/>
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/double_twist_for_camera_suggestion_title" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/double_twist_for_camera_suggestion_summary" />
		</activity>

		<activity
		android:name=".Settings$AmbientDisplaySuggestionActivity"
		android:label="@string/ambient_display_title"
		android:icon="@drawable/ic_suggestion_gesture">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.GESTURE" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
		</intent-filter>
		<meta-data android:name="com.android.settings.dismiss"
		android:value="9,13,30" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.gestures.DoubleTapScreenSettings"/>
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/ambient_display_title" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/ambient_display_suggestion_summary" />
		</activity>

		<activity
		android:name=".Settings$AmbientDisplayPickupSuggestionActivity"
		android:label="@string/ambient_display_pickup_title"
		android:icon="@drawable/ic_suggestion_gesture">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.GESTURE" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
		</intent-filter>
		<meta-data android:name="com.android.settings.dismiss"
		android:value="9,13,30" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.gestures.PickupGestureSettings"/>
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/ambient_display_pickup_title" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/ambient_display_pickup_suggestion_summary" />
		</activity>

		<activity
		android:name=".Settings$SwipeToNotificationSuggestionActivity"
		android:label="@string/fingerprint_swipe_for_notifications_title"
		android:icon="@drawable/ic_suggestion_gesture">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.GESTURE" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
		</intent-filter>
		<meta-data android:name="com.android.settings.dismiss"
		android:value="9,13,30" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.gestures.CameraLiftTriggerSettings"/>
		android:value="com.android.settings.gestures.SwipeToNotificationSettings"/>
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/camera_lift_trigger_title" />
		android:resource="@string/fingerprint_swipe_for_notifications_suggestion_title" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/camera_lift_trigger_suggestion_summary" />
		android:resource="@string/fingerprint_swipe_for_notifications_suggestion_summary" />
		</activity>
		<!-- End activities for moves/gestures suggestions -->

		<activity android:name=".applications.autofill.AutofillPickerActivity"
		android:excludeFromRecents="true"

res/drawable-nodpi/gesture_camera_lift

deleted100644 → 0

+0 −0

Empty file deleted.

res/drawable/ic_suggestion_gesture.xml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2017 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="32.0"
		android:viewportHeight="32.0"
		android:autoMirrored="true">
		<path
		android:fillColor="@color/material_grey_600"
		android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>
		<path
		android:fillColor="@color/material_grey_600"
		android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>
		</vector>

res/layout/connection_detail_pref.xml

deleted100644 → 0

+0 −51

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017 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:id="@+id/connection_detail_layout"
		android:background="?android:attr/colorAccent"
		android:layout_width="match_parent"
		android:layout_height="144dp"
		android:gravity="center_vertical"
		android:orientation="horizontal">

		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:background="@drawable/ic_settings_widget_background"
		android:layout_marginLeft="72dp"
		android:elevation="2dp">

		<ImageView
		android:id="@android:id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"/>

		</FrameLayout>

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="false"
		android:paddingLeft="20dp"
		android:textAppearance="@android:style/TextAppearance.Material.Medium"
		android:textColor="@android:color/white"/>

		</LinearLayout>

res/layout/storage_item.xml

+35 −30

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@
		android:minHeight="?android:attr/listPreferredItemHeightSmall"
		android:gravity="center_vertical"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingTop="16dip"
		android:paddingBottom="16dip"
		android:paddingTop="14dp"
		android:paddingBottom="14dp"
		android:background="?android:attr/selectableItemBackground"
		android:clipToPadding="false">

		@@ -52,11 +52,15 @@
		android:maxHeight="24dp"/>
		</LinearLayout>

		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_vertical" >

		<TextView
		android:id="@android:id/title"
		android:layout_width="0dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:singleLine="true"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead"
		android:textAlignment="viewStart"
		@@ -70,18 +74,19 @@
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondaryNoDisable"
		android:maxLines="10" />

		</LinearLayout>
		android:maxLines="10"
		android:layout_alignParentEnd="true"/>

		<ProgressBar
		android:id="@android:id/progress"
		android:layout_width="match_parent"
		android:layout_height="8dp"
		android:layout_marginStart="72dp"
		android:layout_marginTop="16dp"
		android:layout_marginBottom="8dp"
		android:layout_marginTop="12dp"
		android:layout_marginBottom="4dp"
		android:max="100"
		android:layout_below="@android:id/title"
		android:layout_alignStart="@android:id/title"
		style="?android:attr/progressBarStyleHorizontal" />

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