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

Commit b603ff7b authored by Daniel Huang's avatar Daniel Huang Committed by Android (Google) Code Review
Browse files

Merge "Implement modifier keys settings UI."

parents 6f1639c9 85e0deb1

res/drawable/ic_modifier_keys_reset.xml

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

<!--

    Copyright (C) 2022 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.

-->



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

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?androidprv:attr/colorAccentPrimaryVariant">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M18,4C13.58,0.69 7.31,1.58 4,6V4H2v6h6V8H5.09c1.44,-2.47 4.09,-3.98 6.94,-3.97c4.42,0.02 7.99,3.61 7.97,8.03s-3.61,7.99 -8.03,7.97C7.55,20.01 3.98,16.42 4,12H2c0,3.15 1.48,6.11 4,8c4.42,3.31 10.69,2.42 14,-2C23.31,13.58 22.42,7.31 18,4z"/>

</vector>
 
 No newline at end of file

res/drawable/modifier_key_bordered.xml

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

<!-- Copyright (C) 2022 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.

-->



<inset

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

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

    <ripple

        android:color="?android:attr/colorControlHighlight">

        <item>

            <shape android:shape="rectangle">

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

                <solid android:color="@android:color/transparent"/>

                <stroke

                    android:width="1dp"

                    android:color="?androidprv:attr/colorAccentPrimaryVariant"/>

            </shape>

        </item>

    </ripple>

</inset>
 
 No newline at end of file

res/drawable/modifier_key_colored.xml

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

<!-- Copyright (C) 2022 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.

-->



<inset

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

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

    <ripple

        android:color="?android:attr/colorControlHighlight">

        <item>

            <shape android:shape="rectangle">

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

                <solid android:color="?androidprv:attr/colorAccentPrimary"/>

            </shape>

        </item>

    </ripple>

</inset>
 
 No newline at end of file

res/drawable/modifier_key_lisetview_background.xml

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

<!-- Copyright (C) 2022 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.

-->



<inset

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

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

    <ripple

        android:color="?android:attr/colorControlHighlight">

        <item>

            <shape android:shape="rectangle">

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

                <solid android:color="?androidprv:attr/colorSurfaceVariant"/>

            </shape>

        </item>

    </ripple>

</inset>
 
 No newline at end of file

res/layout/modifier_key_item.xml

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

<!-- Copyright (C) 2022 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.

-->



<RelativeLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="8dip"

    android:layout_marginBottom="8dip"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingEnd="?android:attr/scrollbarSize"

    android:layout_weight="1">



    <ImageView

        android:id="@+id/modifier_key_check_icon"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_alignParentStart="true"

        android:layout_marginStart="24dip"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal"

        android:src="@drawable/ic_check_24dp"

        android:tint="?androidprv:attr/colorAccentPrimaryVariant"/>



    <TextView

        android:id="@+id/modifier_key_text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:textDirection="locale"

        android:padding="16dp"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:layout_toEndOf="@+id/modifier_key_check_icon"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal" />



</RelativeLayout>