From 5d5d0ea14458c3240fde19f32350c8bcbfd30665 Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Mon, 29 Feb 2016 14:11:28 -0800
Subject: [PATCH] Rename settings activity XML to squelch warnings in latest
 AndroidStudio.

---
 .../android/NewsBlur/res/{layout => xml}/activity_settings.xml  | 0
 clients/android/NewsBlur/src/com/newsblur/activity/Main.java    | 2 +-
 .../android/NewsBlur/src/com/newsblur/activity/Settings.java    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename clients/android/NewsBlur/res/{layout => xml}/activity_settings.xml (100%)

diff --git a/clients/android/NewsBlur/res/layout/activity_settings.xml b/clients/android/NewsBlur/res/xml/activity_settings.xml
similarity index 100%
rename from clients/android/NewsBlur/res/layout/activity_settings.xml
rename to clients/android/NewsBlur/res/xml/activity_settings.xml
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Main.java b/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
index 42409197c..64450266d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
@@ -57,7 +57,7 @@ public class Main extends NbActivity implements StateChangedListener, SwipeRefre
 
     @Override
 	public void onCreate(Bundle savedInstanceState) {
-        PreferenceManager.setDefaultValues(this, R.layout.activity_settings, false);
+        PreferenceManager.setDefaultValues(this, R.xml.activity_settings, false);
 
         isLightTheme = PrefsUtils.isLightThemeSelected(this);
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java b/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
index 9a6c85552..b87d4fe66 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
@@ -25,7 +25,7 @@ public class Settings extends PreferenceActivity implements SharedPreferences.On
         preferenceManager.setSharedPreferencesName(PrefConstants.PREFERENCES);
         SharedPreferences prefs = getSharedPreferences(PrefConstants.PREFERENCES, 0);
         prefs.registerOnSharedPreferenceChangeListener(this);
-        addPreferencesFromResource(R.layout.activity_settings);
+        addPreferencesFromResource(R.xml.activity_settings);
 
         // Remove the reading category of references on pre-4.4 devices as it only contains
         // the single tap for immersive preference