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

Commit e02a4ba6 authored by Roman Birg's avatar Roman Birg Committed by Gerrit Code Review
Browse files

WallpaperCropper: fix lockscreen wallpaper "Set wallpaper" string 



The string is wrong and does not reflect the correct action the user is
about to apply.

Change-Id: I91eba87a38546563d6cf88138a0ed07219ec794f
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 3d07d4f9

packages/WallpaperCropper/res/layout/actionbar_set_lockscreen_wallpaper.xml

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

<!--

/*

**

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

*/

-->



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

    style="?android:actionButtonStyle"

    android:id="@+id/set_wallpaper_button"

    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    <TextView style="?android:actionBarTabTextStyle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start|center_vertical"

        android:paddingRight="20dp"

        android:drawableLeft="@drawable/ic_actionbar_accept"

        android:drawablePadding="8dp"

        android:gravity="center_vertical"

        android:text="@string/lockscreen_wallpaper_instructions" />

</FrameLayout>

packages/WallpaperCropper/res/values/cm_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -39,4 +39,6 @@ 
    <string name="pick_wallpaper">Wallpapers</string>

    <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->

    <string name="activity_not_found">App isn\'t installed.</string>

    <!-- Button label on LockWallpaper picker screen to set a lockscreen wallpaper -->

    <string name="lockscreen_wallpaper_instructions">Set lock screen wallpaper</string>

</resources>
 
 No newline at end of file

packages/WallpaperCropper/src/com/android/wallpapercropper/LockWallpaperPickerActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ public class LockWallpaperPickerActivity extends WallpaperCropActivity { 
        // Action bar

        // Show the custom action bar view

        final ActionBar actionBar = getActionBar();

        actionBar.setCustomView(R.layout.actionbar_set_wallpaper);

        actionBar.setCustomView(R.layout.actionbar_set_lockscreen_wallpaper);

        actionBar.getCustomView().setOnClickListener(

                new OnClickListener() {

                    @Override