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

Commit e759e4de authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Separating out Launcher3 resources from Wallpaper resources" into ub-launcher3-calgary

parents 6d455949 5abb9f88

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:stateNotNeeded="true"

            android:theme="@style/Theme"

            android:theme="@style/LauncherTheme"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="nosensor"

            android:configChanges="keyboard|keyboardHidden|navigation"

WallpaperPicker/res/values-v19/styles.xml

+0 −5
Original line number Diff line number Diff line
@@ -24,9 +24,4 @@ 
        <item name="android:windowActionBarOverlay">true</item>

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

    </style>



    <style name="Theme" parent="@style/BaseWallpaperTheme">

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

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

    </style>

</resources>

WallpaperPicker/res/values-v21/styles.xml

+0 −8
Original line number Diff line number Diff line
@@ -32,12 +32,4 @@ 
        <item name="android:textColor">#ffffffff</item>

        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>

    </style>



    <style name="Theme" parent="@style/BaseWallpaperTheme">

        <item name="android:statusBarColor">#00000000</item>

        <item name="android:navigationBarColor">#00000000</item>

        <item name="android:colorControlActivated">@color/launcher_accent_color</item>

        <item name="android:colorAccent">@color/launcher_accent_color</item>

        <item name="android:colorPrimary">@color/launcher_accent_color</item>

    </style>

</resources>
 
 No newline at end of file

WallpaperPicker/res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,6 +19,4 @@ 
-->

<resources>

    <color name="wallpaper_picker_translucent_gray">#66000000</color>



    <color name="launcher_accent_color">#ff009688</color>

</resources>

WallpaperPicker/res/values/styles.xml

+0 −9
Original line number Diff line number Diff line
@@ -35,15 +35,6 @@ 
        <item name="android:background">#88000000</item>

    </style>



    <style name="BaseWallpaperTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:colorBackgroundCacheHint">@null</item>

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

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

    </style>



    <style name="Theme" parent="@style/BaseWallpaperTheme"></style>



    <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton">

        <item name="android:textColor">#ffffffff</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>