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

Commit 5193979a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove padding below work and personal tabs." into rvc-dev am: e32e58c7 am: 5665ab61 

Change-Id: I6287c05043140ad33e141606fd171048e5dc2d73
parents d31f6268 5665ab61

core/res/res/layout/resolver_list.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -100,8 +100,7 @@ 
                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:layout_height="1dp"

                android:background="?attr/colorBackgroundFloating"

                android:background="?attr/colorBackgroundFloating"

                android:foreground="?attr/dividerVertical"

                android:foreground="?attr/dividerVertical"/>

                android:layout_marginBottom="@dimen/resolver_tab_divider_bottom_padding"/>

            <FrameLayout

            <FrameLayout

                android:id="@android:id/tabcontent"

                android:id="@android:id/tabcontent"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

core/res/res/layout/resolver_list_with_default.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -183,8 +183,7 @@ 
                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:layout_height="1dp"

                android:background="?attr/colorBackgroundFloating"

                android:background="?attr/colorBackgroundFloating"

                android:foreground="?attr/dividerVertical"

                android:foreground="?attr/dividerVertical"/>

                android:layout_marginBottom="@dimen/resolver_tab_divider_bottom_padding"/>

            <FrameLayout

            <FrameLayout

                android:id="@android:id/tabcontent"

                android:id="@android:id/tabcontent"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

core/res/res/values/dimens.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -776,7 +776,6 @@ 
    <dimen name="resolver_empty_state_height_with_tabs">268dp</dimen>

    <dimen name="resolver_empty_state_height_with_tabs">268dp</dimen>

    <dimen name="resolver_max_collapsed_height">192dp</dimen>

    <dimen name="resolver_max_collapsed_height">192dp</dimen>

    <dimen name="resolver_max_collapsed_height_with_tabs">248dp</dimen>

    <dimen name="resolver_max_collapsed_height_with_tabs">248dp</dimen>

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





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

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

core/res/res/values/symbols.xml

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

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

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

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

  <java-symbol type="bool" name="sharesheet_show_content_preview" />

  <java-symbol type="bool" name="sharesheet_show_content_preview" />

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





  <!-- Toast message for background started foreground service while-in-use permission restriction feature -->

  <!-- Toast message for background started foreground service while-in-use permission restriction feature -->

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

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