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

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

Snap for 6492800 from abeb1a09 to rvc-release 

Change-Id: Ic820e00d64e8079f151b06409ab7e4d8b8eb494c
parents 79a3a16e abeb1a09

res/layout/notification_sbn_log_row.xml

+114 −101
Original line number Diff line number Diff line
@@ -18,10 +18,15 @@ 
              android:layout_height="wrap_content"

              android:paddingTop="6dp"

              android:minHeight="48dp"

              android:orientation="vertical"

              android:background="?android:attr/selectableItemBackground"

>

    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:orientation="vertical"

    android:background="?android:attr/selectableItemBackground"

        >



        <LinearLayout
@@ -129,4 +134,12 @@ 
            />



        </LinearLayout>



    </LinearLayout>

    <View

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_height="0.5dp"

        android:layout_marginTop="17dp"

        android:background="@color/material_grey_300" />

</LinearLayout>
 
 No newline at end of file

res/layout/preference_multiline_title.xml

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
            android:layout_height="wrap_content"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"

            android:textColor="?android:attr/textColorPrimary"

            android:textAlignment="center"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />

res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -11818,11 +11818,6 @@ 
    <!-- Summary for the top level Privacy Settings [CHAR LIMIT=NONE]-->

    <string name="privacy_dashboard_summary">Permissions, account activity, personal data</string>









    <!-- UI debug setting: show media player on quick settings title [CHAR LIMIT=60] -->









    <string name="quick_settings_media_player">Media resumption</string>









    <!-- UI debug setting: show media player on quick settings summary [CHAR_LIMIT=NONE] -->









    <string name="quick_settings_media_player_summary">Shows and persists media player in Quick Settings. Requires reboot.</string>

















    <!-- Label for button in contextual card for users to remove the card [CHAR LIMIT=30] -->









    <string name="contextual_card_dismiss_remove">Remove</string>









    <!-- Label for button in contextual card for users to keep the card [CHAR LIMIT=30] -->

























res/xml/development_settings.xml



+0
−5






























Original line number
Diff line number
Diff line







@@ -527,11 +527,6 @@







            android:title="@string/usb_audio_disable_routing"









            android:summary="@string/usb_audio_disable_routing_summary" />



















        <SwitchPreference









            android:key="quick_settings_media_player"









            android:title="@string/quick_settings_media_player"









            android:summary="@string/quick_settings_media_player_summary" />



















    </PreferenceCategory>



















    <PreferenceCategory
































src/com/android/settings/Utils.java



+10
−0






























Original line number
Diff line number
Diff line







@@ -42,6 +42,7 @@ import android.content.pm.PackageManager;







import android.content.pm.PackageManager.NameNotFoundException;









import android.content.pm.ResolveInfo;









import android.content.pm.UserInfo;









import android.content.res.Configuration;









import android.content.res.Resources;









import android.content.res.TypedArray;









import android.database.Cursor;








@@ -1101,4 +1102,13 @@ public final class Utils extends com.android.settingslib.Utils {







                context.getString(R.string.config_settingsintelligence_package_name));









        return isSettingsIntelligence;









    }



















    /**









     * Returns true if the night mode is enabled.









     */









    public static boolean isNightMode(Context context) {









        final int currentNightMode =









                context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;









        return currentNightMode == Configuration.UI_MODE_NIGHT_YES;









    }









}