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

Commit 0f02b085 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

Quick affordance picker in ThemePicker. 

Near end-to-end implementation of everything needed to drive the UI for
the lock screen quick affordance picker/selector in wallpaper picker.

This CL includes:
- A contract file definition (which will be moved into a shared library
  soon)
- A client class to abstract away the content resolver API which, using
  the contract, queries the system UI content provider for data
- A clean architecture implementation with: a repository, an interactor,
  view-models, view-binders, and adapters
- Ugly/minimal, to be replaced and/or updated aggressively when the
  wallpaper team actually implements the UI

Bug: 254857639
Test: Included unit tests, verified manually end-to-end in a temporary
activity in the wallpaper picker build that shows the UI.

Change-Id: Icb492be0041d6a594bdf622c2f3e8177c07b82bf
parent 41c5f1d9

Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ android_app { 
        "SettingsLibSettingsTheme",

        "SystemUI-statsd",

        "styleprotoslite",

        "androidx.lifecycle_lifecycle-runtime-ktx",

        "androidx.lifecycle_lifecycle-viewmodel-ktx",

        "androidx.recyclerview_recyclerview",

        "SystemUICustomizationLib",

    ],



    jni_libs: [

res/drawable/link_off.xml

0 → 100644
+26 −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"

    android:width="@dimen/keyguard_quick_affordance_icon_size"

    android:height="@dimen/keyguard_quick_affordance_icon_size"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

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

        android:pathData="M14.39,11L16,12.61V11zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1 0,1.27 -0.77,2.37 -1.87,2.84l1.4,1.4C21.05,15.36 22,13.79 22,12c0,-2.76 -2.24,-5 -5,-5zM2,4.27l3.11,3.11C3.29,8.12 2,9.91 2,12c0,2.76 2.24,5 5,5h4v-1.9H7c-1.71,0 -3.1,-1.39 -3.1,-3.1 0,-1.59 1.21,-2.9 2.76,-3.07L8.73,11H8v2h2.73L13,15.27V17h1.73l4.01,4.01 1.41,-1.41L3.41,2.86 2,4.27z"/>

</vector>

res/drawable/selectable.xml

0 → 100644
+21 −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.

  ~

  -->



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

    <item android:state_selected="true" android:drawable="@drawable/selectable_selected" />

    <item android:drawable="@android:color/transparent" />

</selector>

res/drawable/selectable_selected.xml

0 → 100644
+22 −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.

  ~

  -->



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

    android:shape="rectangle">

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

    <stroke android:width="2dp" android:color="@android:color/white" />

</shape>

res/layout/keyguard_quick_affordance.xml

0 → 100644
+44 −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.

  ~

  -->



<LinearLayout

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

    android:layout_width="@dimen/keyguard_quick_affordance_picker_item_width"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:gravity="center_horizontal">



    <ImageView

        android:id="@+id/icon"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:background="@drawable/selectable" />



    <View

        android:layout_width="0dp"

        android:layout_height="16dp" />



    <TextView

        android:id="@+id/name"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

        android:singleLine="true"

        android:ellipsize="end"/>



</LinearLayout>
 
 No newline at end of file