Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dffec203 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-998756e3-f9eb-4510-98be-1a27f60bee38-for-git_oc-mr1-release-40...

release-request-998756e3-f9eb-4510-98be-1a27f60bee38-for-git_oc-mr1-release-4094614 snap-temp-L07300000073564509

Change-Id: Ic92109e2f5bf263d91af6345fec2f988500dc519
parents 482f6eab 8531fbc0
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginBottom="16dp"
        android:fontFamily="@*android:string/config_headlineFontFamily"
        android:textAppearance="?android:attr/textAppearanceLarge"
        android:textSize="36sp"
        android:textColor="?android:attr/colorAccent" />
+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@
    <!-- Whether to show TelphonyMonitor switch in Developer Options -->
    <bool name="config_show_telephony_monitor">false</bool>

    <!-- Whether to show Camera HAL HDR+ switch in Developer Options -->
    <bool name="config_show_camera_hal_hdrplus">false</bool>

    <!-- Fully-qualified class name for the implementation of the FeatureFactory to be instantiated. -->
    <string name="config_featureFactory" translatable="false">com.android.settings.overlay.FeatureFactoryImpl</string>

+10 −4
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@
    <string name="security_settings_fingerprint_preference_summary_none"></string>
    <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
    <string name="security_settings_fingerprint_enroll_introduction_title">Unlock with fingerprint</string>
    <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature, when fingerprint unlock is disabed by device admin [CHAR LIMIT=29] -->
    <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature, when fingerprint unlock is disabed by device admin [CHAR LIMIT=40] -->
    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled">Use your fingerprint</string>
    <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
    <string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
@@ -864,7 +864,7 @@
    <string name="security_settings_fingerprint_enroll_start_title">Touch the sensor</string>
    <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
    <string name="security_settings_fingerprint_enroll_start_message">Put your finger on the sensor and lift after you feel a vibration</string>
    <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
    <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=40] -->
    <string name="security_settings_fingerprint_enroll_repeat_title">Lift, then touch again</string>
    <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
    <string name="security_settings_fingerprint_enroll_repeat_message">Keep lifting your finger to add the different parts of your fingerprint</string>
@@ -6262,7 +6262,7 @@
    <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
    <string name="call_manager_summary"><xliff:g id="app">%1$s</xliff:g></string>
    <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
    <string name="cell_broadcast_settings">Emergency broadcasts</string>
    <string name="cell_broadcast_settings">Emergency alerts</string>
    <!-- Network operators settings title.  [CHAR LIMIT=50] -->
    <string name="network_operators_settings">Network operators</string>
    <!-- Access point names title.  [CHAR LIMIT=50] -->
@@ -8150,6 +8150,12 @@
    <!-- Toast message letting the user know the how to trigger telephony monitor -->
    <string name="telephony_monitor_toast">To apply telephony monitor change, reboot device</string>
    <!-- Title for Camera HAL HDR+ switch [CHAR LIMIT=50] -->
    <string name="camera_hal_hdrplus_switch">Camera HAL HDR+</string>
    <!-- Toast message letting the user know how to enable Camera HAL HDR+ -->
    <string name="camera_hal_hdrplus_toast">To apply Camera HAL HDR+ change, reboot device</string>
    <!-- Name of the setting to disable the automatic update -->
    <string name="ota_disable_automatic_update">Automatic system updates</string>
@@ -8400,7 +8406,7 @@
    <string name="notification_suggestion_summary">Show or hide notification content</string>
    <!-- Setting tab title for all setting options. [CHAR LIMIT=20] -->
    <string name="page_tab_title_summary">All</string>
    <!-- Setting tab title for support setting options. [CHAR LIMIT=20] -->
    <!-- Setting tab title for support setting options. [CHAR LIMIT=25] -->
    <string name="page_tab_title_support">Support &amp; tips</string>
    <!-- Summary of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,10 @@
            android:title="@string/telephony_monitor_switch"
            android:summary="@string/telephony_monitor_switch_summary"/>

        <SwitchPreference
            android:key="camera_hal_hdrplus_switch"
            android:title="@string/camera_hal_hdrplus_switch" />

    </PreferenceCategory>

    <PreferenceCategory android:key="debug_networking_category"
+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
        // Set ComparisonCallback so we get better animation when list changes.
        getPreferenceManager().setPreferenceComparisonCallback(
                new PreferenceManager.SimplePreferenceComparisonCallback());
        // Upon rotation configuration change we need to update preference states before any
        // editing dialog is recreated (that would happen before onResume is called).
        updatePreferenceStates();
    }

    @Override
Loading