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

Commit 58538c87 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Add controls rearrange activity" into rvc-dev am: 0935694b am: 7b4a6a8e am: 9ba17c26 

Change-Id: Ib86e6ede6e48e6c82c419b0b21aaf781156d391d
parents dc8a6d46 9ba17c26

packages/SystemUI/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -679,6 +679,15 @@ 
                  android:visibleToInstantApps="true">

        </activity>



        <activity android:name=".controls.management.ControlsEditingActivity"

                  android:theme="@style/Theme.ControlsManagement"

                  android:excludeFromRecents="true"

                  android:showForAllUsers="true"

                  android:finishOnTaskLaunch="true"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"

                  android:visibleToInstantApps="true">

        </activity>



        <activity android:name=".controls.management.ControlsFavoritingActivity"

                  android:theme="@style/Theme.ControlsManagement"

                  android:excludeFromRecents="true"

packages/SystemUI/res/layout/controls_horizontal_divider_withEmpty.xml

0 → 100644
+44 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<LinearLayout

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

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

>



    <View

        android:layout_width="match_parent"

        android:layout_height="@dimen/controls_management_list_margin"

        />



    <FrameLayout

        android:id="@+id/frame"

        android:layout_width="match_parent"

        android:layout_height="@dimen/control_height"

        android:visibility="gone"

    >

    </FrameLayout>

    <View

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_marginBottom="10dp"

        android:layout_marginStart="40dp"

        android:layout_marginEnd="40dp"

        android:background="#4dffffff" />

</LinearLayout>

packages/SystemUI/res/layout/controls_management_apps.xml

+5 −12
Original line number Diff line number Diff line
@@ -14,18 +14,11 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="0dp"

    android:layout_weight="1"

    android:orientation="vertical"

    android:layout_marginTop="@dimen/controls_management_list_margin">



<androidx.recyclerview.widget.RecyclerView

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

    android:id="@+id/list"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_marginTop="@dimen/controls_management_list_margin"

/>

</androidx.core.widget.NestedScrollView>

packages/SystemUI/res/layout/controls_management_editing.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<androidx.recyclerview.widget.RecyclerView

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

    android:id="@+id/list"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingTop="@dimen/controls_management_list_margin"

/>

packages/SystemUI/res/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -2670,8 +2670,11 @@ 
    <string name="controls_favorite_default_title">Controls</string>

    <!-- Controls management controls screen subtitle [CHAR LIMIT=NONE] -->

    <string name="controls_favorite_subtitle">Choose controls to access from the power menu</string>

    <!-- Controls management controls screen, user direction for rearranging controls [CHAR LIMIT=NONE] -->

    <string name="controls_favorite_rearrange">Hold and drag a control to move it</string>

    <!-- Controls management editing screen, user direction for rearranging controls [CHAR LIMIT=NONE] -->

    <string name="controls_favorite_rearrange">Hold &amp; drag to rearrange controls</string>



    <!-- Controls management editing screen, text to indicate that all the favorites have been removed [CHAR LIMIT=NONE] -->

    <string name="controls_favorite_removed">All controls removed</string>



    <!-- Controls management controls screen error on load message [CHAR LIMIT=60] -->

    <string name="controls_favorite_load_error">The list of all controls could not be loaded.</string>