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

Commit ddaba436 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Initial implementation of NotificationStackScroller"

parents 73581eff 67b22600

core/res/res/drawable/notification_quantum_background.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,5 +17,5 @@ 




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

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

    <solid android:color="#ffffffff" />

    <solid android:color="#ffffffff" />

    <corners android:radius="2dp" />

    <corners android:radius="@dimen/notification_quantum_rounded_rect_radius" />

</shape>
 
</shape>
 
 No newline at end of file

core/res/res/values/dimens.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -366,4 +366,7 @@ 
    <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->

    <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->

    <dimen name="immersive_mode_cling_width">-1px</dimen>

    <dimen name="immersive_mode_cling_width">-1px</dimen>





    <!-- radius of the corners of the quantum rounded rect background -->

    <dimen name="notification_quantum_rounded_rect_radius">2dp</dimen>



</resources>
 
</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -346,6 +346,7 @@ 
  <java-symbol type="dimen" name="notification_title_text_size" />

  <java-symbol type="dimen" name="notification_title_text_size" />

  <java-symbol type="dimen" name="notification_subtext_size" />

  <java-symbol type="dimen" name="notification_subtext_size" />

  <java-symbol type="dimen" name="immersive_mode_cling_width" />

  <java-symbol type="dimen" name="immersive_mode_cling_width" />

  <java-symbol type="dimen" name="notification_quantum_rounded_rect_radius" />





  <java-symbol type="string" name="add_account_button_label" />

  <java-symbol type="string" name="add_account_button_label" />

  <java-symbol type="string" name="addToDictionary" />

  <java-symbol type="string" name="addToDictionary" />

packages/SystemUI/res/layout/status_bar_expanded.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -92,6 +92,12 @@ 
                    systemui:rowHeight="@dimen/notification_row_min_height"

                    systemui:rowHeight="@dimen/notification_row_min_height"

                    />

                    />

            </ScrollView>

            </ScrollView>



            <com.android.systemui.statusbar.stack.NotificationStackScrollLayout

                    android:id="@+id/notification_stack_scroller"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    />

        </FrameLayout>

        </FrameLayout>

    </LinearLayout>

    </LinearLayout>

</com.android.systemui.statusbar.phone.NotificationPanelView><!-- end of sliding panel -->
 
</com.android.systemui.statusbar.phone.NotificationPanelView><!-- end of sliding panel -->

packages/SystemUI/res/values/dimens.xml

+15 −0
Original line number Original line Diff line number Diff line
@@ -233,6 +233,21 @@ 
    <!-- The size of the icon in the recents task view. -->

    <!-- The size of the icon in the recents task view. -->

    <dimen name="recents_task_view_icon_size">60dp</dimen>

    <dimen name="recents_task_view_icon_size">60dp</dimen>





    <!-- Space below the notification stack -->

    <dimen name="notification_stack_margin_bottom">0dp</dimen>



    <!-- Space reserved for the cards behind the top card in the top stack -->

    <dimen name="top_stack_peek_amount">24dp</dimen>



    <!-- Space reserved for the cards behind the top card in the bottom stack -->

    <dimen name="bottom_stack_peek_amount">18dp</dimen>



    <!-- The side padding of the notifications-->

    <dimen name="notification_side_padding">8dp</dimen>



    <!-- Z distance between notifications if they are in the stack -->

    <dimen name="z_distance_between_notifications">2dp</dimen>



    <!-- Width of the zen mode interstitial dialog.  Defaults to MATCH_PARENT. -->

    <!-- Width of the zen mode interstitial dialog.  Defaults to MATCH_PARENT. -->

    <dimen name="zen_mode_dialog_width">-1px</dimen>

    <dimen name="zen_mode_dialog_width">-1px</dimen>

</resources>
 
</resources>