release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-41... (d69c7694) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+39 −18

Original line number	Diff line number	Diff line
		@@ -812,6 +812,7 @@
		android:resource="@string/wallpaper_suggestion_summary" />
		<meta-data android:name="com.android.settings.dismiss"
		android:value="3,7,30" />
		<meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
		</activity>

		<activity android:name=".support.NewDeviceIntroSuggestionActivity"
		@@ -1481,6 +1482,8 @@
		</intent-filter>
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/vision_settings_suggestion_title" />
		<meta-data android:name="com.android.settings.icon_tintable"
		android:value="true" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		@@ -1595,6 +1598,7 @@
		android:resource="@string/notification_suggestion_title" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/notification_suggestion_summary" />
		<meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
		</activity>

		<activity android:name=".notification.RedactionInterstitial"
		@@ -1615,24 +1619,6 @@
		android:windowSoftInputMode="stateHidden\|adjustResize"
		android:theme="@style/GlifTheme.Light"/>

		<activity
		android:name=".Settings$FingerprintSuggestionActivity"
		android:label="@string/security_settings_fingerprint_preference_title"
		android:icon="@drawable/ic_suggestion_fingerprint">
		<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="5,9,30" />
		<meta-data android:name="com.android.settings.require_feature"
		android:value="android.hardware.fingerprint" />
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/suggestion_additional_fingerprints" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/suggestion_additional_fingerprints_summary" />
		</activity>

		<activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>
		<activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
		<activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
		@@ -1652,6 +1638,30 @@
		</intent-filter>
		</activity>

		<activity android:name=".fingerprint.FingerprintSuggestionActivity"
		android:exported="true"
		android:permission="android.permission.MANAGE_FINGERPRINT"
		android:icon="@drawable/ic_suggestion_fingerprint"
		android:theme="@style/GlifTheme.Light">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.FINGERPRINT_ENROLL" />
		</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="5,9,30" />
		<meta-data android:name="com.android.settings.require_feature"
		android:value="android.hardware.fingerprint" />
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/suggestion_additional_fingerprints" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/suggestion_additional_fingerprints_summary" />
		<meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
		</activity>

		<!-- Note this must not be exported since it returns the password in the intent -->
		<activity android:name=".password.ConfirmLockPattern$InternalActivity"
		android:exported="false"
		@@ -1702,6 +1712,7 @@
		android:resource="@string/suggested_lock_settings_title" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/suggested_lock_settings_summary" />
		<meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
		</activity>

		<activity android:name=".Settings$FingerprintEnrollSuggestionActivity"
		@@ -2500,6 +2511,16 @@
		</intent-filter>
		</activity>

		<activity android:name="Settings$SpecialAccessSettingsActivity"
		android:taskAffinity="">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.SpecialAccessSettings" />
		</activity>

		<activity android:name="Settings$NotificationAccessSettingsActivity"
		android:label="@string/manage_notification_access_title"
		android:taskAffinity="">

res/layout/choose_lock_password.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,13 @@
		android:gravity="center_horizontal"
		android:orientation="vertical">

		<TextView
		android:id="@+id/fingerprint_backup_message"
		style="@style/SuwDescription.Glif"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone" />

		<LinearLayout
		android:id="@+id/password_container"
		android:layout_width="match_parent"

res/values/config.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -116,4 +116,6 @@
		<!-- Class name for the storage manager's deletion helper class. -->
		<string name="config_deletion_helper_class" translatable="false">com.android.storagemanager.deletionhelper.DeletionHelperActivity</string>

		<!-- Whether or not new device intro suggestion is supported for this device -->
		<bool name="config_new_device_intro_suggestion_supported">false</bool>
		</resources>

res/values/strings.xml

+4 −22

Original line number	Diff line number	Diff line
		@@ -883,7 +883,7 @@
		<string name="security_settings_fingerprint_enroll_done">Done</string>
		<!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
		<string name="security_settings_fingerprint_enroll_touch_dialog_title">Whoops, that\u2019s not the sensor</string>
		<!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
		<!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=NONE] -->
		<string name="security_settings_fingerprint_enroll_touch_dialog_message">Touch the sensor on the back of your phone. Use your index finger.</string>
		<!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
		<string name="security_settings_fingerprint_enroll_error_dialog_title">Enrollment was not completed</string>
		@@ -4164,27 +4164,6 @@
		<!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
		<string name="allow_bind_app_widget_activity_always_allow_bind">Always allow <xliff:g id="widget_host_name">%1$s</xliff:g> to create widgets and access their data</string>

		<!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
		<string name="battery_history_days"><xliff:g id="days">%1$d</xliff:g>d <xliff:g id="hours">%2$d</xliff:g>h <xliff:g id="minutes">%3$d</xliff:g>m <xliff:g id="seconds">%4$d</xliff:g>s</string>

		<!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
		<string name="battery_history_hours"><xliff:g id="hours">%1$d</xliff:g>h <xliff:g id="minutes">%2$d</xliff:g>m <xliff:g id="seconds">%3$d</xliff:g>s</string>

		<!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
		<string name="battery_history_minutes"><xliff:g id="minutes">%1$d</xliff:g>m <xliff:g id="seconds">%2$d</xliff:g>s</string>

		<!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
		<string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g>s</string>

		<!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
		<string name="battery_history_days_no_seconds"><xliff:g id="days">%1$d</xliff:g>d <xliff:g id="hours">%2$d</xliff:g>h <xliff:g id="minutes">%3$d</xliff:g>m</string>

		<!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
		<string name="battery_history_hours_no_seconds"><xliff:g id="hours">%1$d</xliff:g>h <xliff:g id="minutes">%2$d</xliff:g>m</string>

		<!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
		<string name="battery_history_minutes_no_seconds"><xliff:g id="minutes">%1$d</xliff:g>m</string>

		<!-- XXX remove? Strings used for displaying usage statistics -->
		<string name="usage_stats_label">Usage statistics</string>

		@@ -8984,4 +8963,7 @@

		<!-- The divider symbol between different parts of the notification header including spaces. not translatable [CHAR LIMIT=3] -->
		<string name="notification_header_divider_symbol_with_spaces" translatable="false">" • "</string>

		<!-- Note displayed when certain features are not available on low ram devices. [CHAR LIMIT=NONE] -->
		<string name="disabled_low_ram_device">This feature is not available on this device</string>
		</resources>

res/xml/app_and_notification.xml

+6 −2

Original line number	Diff line number	Diff line
		@@ -70,8 +70,12 @@

		<Preference
		android:key="special_access"
		android:fragment="com.android.settings.applications.SpecialAccessSettings"
		android:title="@string/special_access"
		android:order="20" />
		android:order="20" >
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.settings"
		android:targetClass="com.android.settings.Settings$SpecialAccessSettingsActivity" />
		</Preference>

		</PreferenceScreen>
		No newline at end of file