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

Merge "Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config." into nyc-mr1-dev

Browse Source
This commit is contained in:
Sunny Goyal
2016-06-14 16:51:09 +00:00
committed by Android (Google) Code Review
parent 78a0197320 0bf6f94c58
commit fef6234ebc
4 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AndroidManifest.xml
View File

@@ -856,21 +856,19 @@
android:value="com.android.settings.WallpaperTypeSettings" />
</activity>
<activity android:name="Settings$WallpaperSuggestionActivity"
android:label="@string/wallpaper_settings_title"
android:exported="true"
android:icon="@drawable/ic_wallpaper"
android:taskAffinity="">
<activity android:name="WallpaperSuggestionActivity"
android:label="@string/wallpaper_settings_title"
android:icon="@drawable/ic_wallpaper"
android:exported="true"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter android:priority="1">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.WallpaperTypeSettings" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/wallpaper_suggestion_title" />
android:resource="@string/wallpaper_suggestion_title" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/wallpaper_suggestion_summary" />
android:resource="@string/wallpaper_suggestion_summary" />
</activity>
<activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"

1
src/com/android/settings/Settings.java
View File

@@ -132,7 +132,6 @@ public class Settings extends SettingsActivity {
public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }
public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }
public static class WallpaperSuggestionActivity extends SettingsActivity { /* empty */ }
public static class FingerprintSuggestionActivity extends FingerprintSettings { /* empty */ }
public static class FingerprintEnrollSuggestionActivity extends FingerprintEnrollIntroduction {
/* empty */

35
src/com/android/settings/WallpaperSuggestionActivity.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* 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.app.Activity;
import android.content.Intent;
import android.os.Bundle;
public class WallpaperSuggestionActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Intent intent = new Intent()
.setClassName(getString(R.string.config_wallpaper_picker_package),
getString(R.string.config_wallpaper_picker_class))
.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(intent);
finish();
}
}

2
src/com/android/settings/dashboard/SuggestionsChecks.java
View File

@@ -32,9 +32,9 @@ import com.android.ims.ImsManager;
import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
import com.android.settings.Settings.FingerprintSuggestionActivity;
import com.android.settings.Settings.ScreenLockSuggestionActivity;
import com.android.settings.Settings.WallpaperSuggestionActivity;
import com.android.settings.Settings.WifiCallingSuggestionActivity;
import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
import com.android.settings.WallpaperSuggestionActivity;
import com.android.settingslib.drawer.Tile;
import java.util.Collection;