summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-09-12 19:26:55 +0300
committerMichael Bestas <mikeioannina@gmail.com>2015-09-12 19:26:55 +0300
commit92bdfc02cafed456319960584a9dfc462d2e0934 (patch)
tree37a92a9bb4d5012c17a2565a493c798ec74b0221
parent0b1bbdbdced3a71c4d8217fb69d351a735a797f8 (diff)
downloadandroid_packages_apps_Trebuchet-92bdfc02cafed456319960584a9dfc462d2e0934.tar.gz
android_packages_apps_Trebuchet-92bdfc02cafed456319960584a9dfc462d2e0934.tar.bz2
android_packages_apps_Trebuchet-92bdfc02cafed456319960584a9dfc462d2e0934.zip
Fix mismerge
Change-Id: I017c84abe752734bceb0bebef557376b5955b8fa
-rw-r--r--WallpaperPicker/res/layout/actionbar_set_lockscreen_wallpaper.xml32
-rw-r--r--WallpaperPicker/res/values/cm_strings.xml23
2 files changed, 0 insertions, 55 deletions
diff --git a/WallpaperPicker/res/layout/actionbar_set_lockscreen_wallpaper.xml b/WallpaperPicker/res/layout/actionbar_set_lockscreen_wallpaper.xml
deleted file mode 100644
index 5160e5d2a..000000000
--- a/WallpaperPicker/res/layout/actionbar_set_lockscreen_wallpaper.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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.
-*/
--->
-
-<com.android.launcher3.AlphaDisableableButton
- xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/ActionBarSetWallpaperStyle"
- android:id="@+id/set_wallpaper_button"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingRight="20dp"
- android:drawableLeft="@drawable/ic_actionbar_accept"
- android:drawablePadding="8dp"
- android:gravity="start|center_vertical"
- android:text="@string/lockscreen_wallpaper_instructions">
-</com.android.launcher3.AlphaDisableableButton>
diff --git a/WallpaperPicker/res/values/cm_strings.xml b/WallpaperPicker/res/values/cm_strings.xml
deleted file mode 100644
index 013fc0216..000000000
--- a/WallpaperPicker/res/values/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Clear keyguard wallpaper tile text -->
- <string name="clear_keyguard_wallpaper">Clear</string>
-
- <!-- Button label on LockWallpaper picker screen to set a lockscreen wallpaper -->
- <string name="lockscreen_wallpaper_instructions">Set lock screen wallpaper</string>
-</resources>