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

Commit ae007814 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Add PageIndicator interface and custom PageIndicatorLine view." into ub-launcher3-calgary

parents 63d1b330 f549dab3

res/layout-port/launcher.xml

+3 −5
Original line number Original line Diff line number Diff line
@@ -57,12 +57,10 @@ 




        <!-- Keep these behind the workspace so that they are not visible when

        <!-- Keep these behind the workspace so that they are not visible when

             we go into AllApps -->

             we go into AllApps -->

        <include

        <com.android.launcher3.pageindicators.PageIndicatorLine

            android:id="@+id/page_indicator"

            android:id="@+id/page_indicator"

            layout="@layout/page_indicator"

            android:layout_width="match_parent"

            android:layout_width="wrap_content"

            android:layout_height="1dp" />

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal" />





        <include

        <include

            android:id="@+id/app_info_drop_target_bar"

            android:id="@+id/app_info_drop_target_bar"

res/layout-sw720dp/launcher.xml

+4 −5
Original line number Original line Diff line number Diff line
@@ -64,11 +64,10 @@ 




        <!-- Keep these behind the workspace so that they are not visible when

        <!-- Keep these behind the workspace so that they are not visible when

             we go into AllApps -->

             we go into AllApps -->

        <include android:id="@+id/page_indicator"

        <com.android.launcher3.pageindicators.PageIndicatorLine

            layout="@layout/page_indicator"

            android:id="@+id/page_indicator"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="1dp" />

            android:layout_gravity="center_horizontal" />





        <include layout="@layout/widgets_view"

        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

            android:id="@+id/widgets_view"

res/layout/page_indicator.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -13,9 +13,9 @@ 
     See the License for the specific language governing permissions and

     See the License for the specific language governing permissions and

     limitations under the License.

     limitations under the License.

-->

-->

<com.android.launcher3.PageIndicator

<com.android.launcher3.pageindicators.PageIndicatorDots

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

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

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:animateLayoutChanges="true"

    android:animateLayoutChanges="true"

    launcher:windowSize="@integer/config_maxNumberOfPageIndicatorsToShow">

    launcher:windowSize="@integer/config_maxNumberOfPageIndicatorsToShow">

</com.android.launcher3.PageIndicator>
 
</com.android.launcher3.pageindicators.PageIndicatorDots>

res/layout/page_indicator_marker.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     See the License for the specific language governing permissions and

     limitations under the License.

     limitations under the License.

-->

-->

<com.android.launcher3.PageIndicatorMarker

<com.android.launcher3.pageindicators.PageIndicatorDot

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

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

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:layout_width="12dp"

    android:layout_width="12dp"
@@ -36,4 +36,4 @@ 
        android:scaleX="0.5"

        android:scaleX="0.5"

        android:scaleY="0.5"

        android:scaleY="0.5"

        />

        />

</com.android.launcher3.PageIndicatorMarker>
 
</com.android.launcher3.pageindicators.PageIndicatorDot>

res/values/attrs.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
    </declare-styleable>

    </declare-styleable>





    <!-- Page Indicator specific attributes. -->

    <!-- Page Indicator specific attributes. -->

    <declare-styleable name="PageIndicator">

    <declare-styleable name="PageIndicatorDots">

        <attr name="windowSize" format="integer"  />

        <attr name="windowSize" format="integer"  />

    </declare-styleable>

    </declare-styleable>