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

Commit 48e725bd authored by Mathew Inwood's avatar Mathew Inwood Committed by Android Git Automerger
Browse files

am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 

* commit '56ca86b7':
  Fix issue where clings didn't appear after set up wizard (issue 13077829)
  Import translations. DO NOT MERGE
  use restored icon for restored app shortcuts
  Fix for Can't convert to dimension: type=0x12 Crash on JB deviecs.
parents 9ee14249 56ca86b7

WallpaperPicker/res/values-sw720dp-v19/styles.xml

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

<!--

/*

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

    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">

        <item name="android:windowActionModeOverlay">true</item>

        <item name="android:windowTranslucentStatus">true</item>

        <item name="android:windowTranslucentNavigation">true</item>

    </style>

</resources>

WallpaperPicker/res/values-sw720dp/styles.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -20,7 +20,5 @@ 
<resources>

<resources>

    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">

    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">

        <item name="android:windowActionModeOverlay">true</item>

        <item name="android:windowActionModeOverlay">true</item>

        <item name="android:windowTranslucentStatus">true</item>

        <item name="android:windowTranslucentNavigation">true</item>

    </style>

    </style>

</resources>
 
</resources>

WallpaperPicker/res/values-v19/styles.xml

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

<!--

/*

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

    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">

        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>

        <item name="android:windowFullscreen">true</item>

        <item name="android:windowActionBarOverlay">true</item>

        <item name="android:windowTranslucentNavigation">true</item>

    </style>



    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">

        <item name="android:windowTranslucentStatus">true</item>

        <item name="android:windowTranslucentNavigation">true</item>

    </style>

</resources>

WallpaperPicker/res/values/styles.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>

        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>

        <item name="android:windowFullscreen">true</item>

        <item name="android:windowFullscreen">true</item>

        <item name="android:windowActionBarOverlay">true</item>

        <item name="android:windowActionBarOverlay">true</item>

        <item name="android:windowTranslucentNavigation">true</item>

    </style>

    </style>





    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">

    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
@@ -31,7 +30,5 @@ 
    </style>

    </style>





    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">

    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">

        <item name="android:windowTranslucentStatus">true</item>

        <item name="android:windowTranslucentNavigation">true</item>

    </style>

    </style>

</resources>
 
</resources>

res/layout/custom_workspace_cling.xml

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

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

-->

<!-- dummy layout, to be replaced in overlays -->

<com.android.launcher3.Cling

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

    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    launcher:drawIdentifier="workspace_custom">

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="20dp"

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

        android:text="@string/dummy_custom_cling_error_message"

        android:gravity="start"

        android:layout_gravity="bottom|start"

    />

</com.android.launcher3.Cling>