PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use standard preference layout for wallpaper picker" into oc-dev

Browse Source 
am: 8e1d588cdf

Change-Id: If8d1c3c3f8dd318e5c85393bf430a22fc07a8a89
This commit is contained in:
Fan Zhang
2017-04-17 21:18:14 +00:00
committed by android-build-merger
parent 9827007c5e 8e1d588cdf
commit d96ce57713
3 changed files with 0 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
res/layout/preference_wallpaper_type.xml
View File

@@ -1,43 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" >
<ImageView
android:id="@android:id/icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:scaleType="fitXY"
android:layout_marginEnd="16dip"
android:contentDescription="@null" />
<TextView android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:layout_weight="1" />
</LinearLayout>

1
src/com/android/settings/wallpaper/WallpaperTypeSettings.java
View File

@@ -67,7 +67,6 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements
// Add Preference items for each of the matching activities
for (ResolveInfo info : rList) {
Preference pref = new Preference(getPrefContext());
pref.setLayoutResource(R.layout.preference_wallpaper_type);
Intent prefIntent = new Intent(intent);
prefIntent.setComponent(new ComponentName(
info.activityInfo.packageName, info.activityInfo.name));

34
tests/unit/src/com/android/settings/WallpaperPreferenceLayoutTest.java
View File

@@ -1,34 +0,0 @@
/*
* Copyright (C) 2016 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.
*/
package com.android.settings;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import org.junit.Test;
import org.junit.runner.RunWith;
@SmallTest
@RunWith(AndroidJUnit4.class)
public class WallpaperPreferenceLayoutTest {
@Test
public void testInflateWallpaperPreferenceLayout_doesNotCrash() {
LayoutInflater.from(InstrumentationRegistry.getTargetContext())
.inflate(R.layout.preference_wallpaper_type, null, false);
}
}