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

Commit e2a8c53f authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Link to new app notification settings from the inspector." into lmp-dev

parents 83c7a53b e9a4e90d

packages/SystemUI/res/layout/notification_guts.xml

+8 −24
Original line number Diff line number Diff line
@@ -77,30 +77,14 @@ 
                    />

        </LinearLayout>



        <LinearLayout

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:padding="8dp"

                android:layout_weight="0"

                android:orientation="horizontal"

                android:showDividers="beginning|middle"

                android:divider="@*android:drawable/list_divider_holo_dark"

                android:dividerPadding="8dp"

                >

            <Button style="@android:style/Widget.Material.Light.Button.Borderless.Small"

        <ImageButton style="@android:style/Widget.Material.Light.Button.Borderless.Small"

                android:id="@+id/notification_inspect_item"

                    android:layout_width="0dp"

                android:layout_width="52dp"

                android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:gravity="start|center_vertical"

                    android:drawablePadding="8dp"

                    android:paddingStart="8dp"

                    android:textColor="@color/notification_guts_btn_color"

                    android:textSize="14dp"

                    android:singleLine="true"

                    android:ellipsize="end"

                    android:text="@string/status_bar_notification_inspect_item_title"

                android:layout_weight="0"

                android:gravity="center"

                android:contentDescription="@string/status_bar_notification_inspect_item_title"

                android:src="@drawable/ic_settings"

                />

    </LinearLayout>

    </LinearLayout>

</FrameLayout>

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        android:layout_width="48dp"

        android:layout_height="@dimen/status_bar_header_height"

        android:background="@drawable/ripple_drawable"

        android:src="@drawable/ic_settings_24dp"

        android:src="@drawable/ic_settings"

        android:contentDescription="@string/accessibility_desc_quick_settings"/>



    <LinearLayout android:id="@+id/system_icons_super_container"

packages/SystemUI/res/layout/zen_mode_panel.xml

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
            android:clickable="true"

            android:contentDescription="@null"

            android:scaleType="center"

            android:src="@drawable/ic_settings_24dp" />

            android:src="@drawable/ic_settings" />

    </FrameLayout>



    <LinearLayout

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -454,8 +454,8 @@ 
    <string name="accessibility_clear_all">Clear all notifications.</string>



    <!-- Title shown in notification popup for inspecting the responsible

         application -->

    <string name="status_bar_notification_inspect_item_title">App info</string>

         application [CHAR LIMIT=30] -->

    <string name="status_bar_notification_inspect_item_title">Settings</string>



    <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->

    <string name="accessibility_rotation_lock_off">Screen will rotate automatically.</string>