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

Commit 0af5f190 authored by Jon's avatar Jon
Browse files

Merge branch 'ub-launcher3-master' into master 

Bug: 73327733
Test: manual test
Change-Id: Id2211340155ebea35a2adc04b6f41237911e9856
parents 27fa808b fe560d80

Android.mk

+7 −5
Original line number Diff line number Diff line
@@ -20,9 +20,13 @@ LOCAL_PATH := $(call my-dir) 
# Prebuilt Java Libraries

#

include $(CLEAR_VARS)

LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \

    libSharedSystemUI:quickstep/libs/sysui_shared.jar

include $(BUILD_MULTI_PREBUILT)

LOCAL_MODULE := libSharedSystemUI

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_SRC_FILES := quickstep/libs/sysui_shared.jar

LOCAL_UNINSTALLABLE_MODULE := true

LOCAL_SDK_VERSION := current

include $(BUILD_PREBUILT)



#

# Build rule for Launcher3 app.
@@ -121,8 +125,6 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \ 
    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := go/AndroidManifest.xml



LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*



include $(BUILD_PACKAGE)

build.gradle

+4 −4
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ apply plugin: 'com.android.application' 
apply plugin: 'com.google.protobuf'



android {

    compileSdkVersion 27

    buildToolsVersion '27.0.0'

    compileSdkVersion 28

    buildToolsVersion '28.0.0'



    defaultConfig {

        minSdkVersion 21

        targetSdkVersion 27

        targetSdkVersion 28

        versionCode 1

        versionName "1.0"
@@ -102,7 +102,7 @@ repositories { 
    jcenter()

}



final String SUPPORT_LIBS_VERSION = '27.0.0-SNAPSHOT'

final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT'

dependencies {

    compile "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"

    compile "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}"

go/res/drawable/ic_widget.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

Copyright (C) 2017 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="48dp"

        android:height="48dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M3.9,18.35c2.5-2.49,5.78-3.64,10.14-3.64v3.05c0,0.47,0.57,0.71,0.9,0.37l5.74-5.74c0.41-0.41,0.41-1.08,0-1.49l-5.74-5.74

        c-0.33-0.33-0.9-0.1-0.9,0.37v2.95c-6.32,0.9-9.56,4.9-11.02,9.34C2.86,18.34,3.51,18.74,3.9,18.35z"/>

</vector>

go/res/layout/widget_cell_content.xml

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

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

-->

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/widget_preview_label_vertical_padding"

        android:paddingBottom="@dimen/widget_preview_label_vertical_padding"

        android:paddingLeft="@dimen/widget_preview_label_horizontal_padding"

        android:paddingRight="@dimen/widget_preview_label_horizontal_padding"

        android:orientation="horizontal">



        <!-- The name of the widget. -->

        <TextView

            android:id="@+id/widget_name"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:ellipsize="end"

            android:fadingEdge="horizontal"

            android:fontFamily="sans-serif-condensed"

            android:gravity="center"

            android:singleLine="true"

            android:maxLines="1"

            android:textColor="?android:attr/textColorSecondary"

            android:textSize="14sp" />



        <!-- The original dimensions of the widget (can't be the same text as above due to different

             style. -->

        <TextView

            android:id="@+id/widget_dims"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="5dp"

            android:layout_marginLeft="5dp"

            android:visibility="gone"

            android:textColor="?android:attr/textColorSecondary"

            android:textSize="14sp"

            android:fontFamily="sans-serif-condensed"

            android:alpha="0.8" />

    </LinearLayout>



    <!-- The image of the widget. This view does not support padding. Any placement adjustment

         should be done using margins. -->

    <com.android.launcher3.widget.WidgetImageView

        android:id="@+id/widget_preview"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

</merge>
 
 No newline at end of file

go/res/values-am/strings.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

/*

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

*/

 -->



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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="long_press_widget_to_add" msgid="4001616142797446267">"አንድ አቋራጭ ለመውሰድ ነክተው ይያዙ"</string>

    <string name="long_accessible_way_to_add" msgid="2725225828389948328">"አንድ አቋራጭ ለመውሰድ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ አድርገው ይያዙ።"</string>

    <string name="widget_button_text" msgid="4221900832360456858">"አቋራጮች"</string>

    <string name="widgets_bottom_sheet_title" msgid="3949835990909395998">"<xliff:g id="NAME">%1$s</xliff:g> አቋራጮች"</string>

</resources>