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

Commit 465efadd authored by Amith Dsouza's avatar Amith Dsouza Committed by android-build-merger
Browse files

Merge branch 'ub-launcher3-master' into 'pi-dev' am: 2fae99f9 

am: dca0aa03

Change-Id: I5d1f634f57dd47d95c2dc6512d285c4b72f28fb0
parents 96992e9e dca0aa03

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ 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)

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
    <permission

        android:name="com.android.launcher3.permission.READ_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="normal"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_read_settings"

        android:description="@string/permdesc_read_settings"/>

    <permission

go/AndroidManifest.xml

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

<!--

/*

**

** Copyright 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.

*/

-->

<manifest

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

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.launcher3" >



    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>



    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"

        android:fullBackupOnly="true"

        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:theme="@style/LauncherTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >



        <!-- Activity for handling PinItemRequest. Only supports shortcuts -->

        <activity android:name="com.android.launcher3.dragndrop.AddItemActivity"

            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"

            android:excludeFromRecents="true"

            android:autoRemoveFromRecents="true"

            android:label="@string/action_add_to_workspace"

            tools:node="replace" >

            <intent-filter>

                <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />

            </intent-filter>

        </activity>



    </application>



</manifest>

go/res/drawable/ic_widget.xml

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

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