From 7acbd6f73553aef997ff9918cd4f811dfc4867ee Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@gmail.com>
Date: Thu, 22 Feb 2018 01:55:15 +0100
Subject: [PATCH] samsung: doze: Rename to avoid conflicts with AdvancedDisplay

Change-Id: I669835f3563b9eea4fce6db45552c0e3a0888911
---
 doze/AndroidManifest.xml                                        | 2 +-
 doze/proguard.flags                                             | 2 +-
 .../settings/{device => doze}/BootCompletedReceiver.java        | 2 +-
 .../settings/{device => doze}/SamsungDozeActivity.java          | 2 +-
 .../lineageos/settings/{device => doze}/SamsungDozeService.java | 2 +-
 .../settings/{device => doze}/TouchscreenGestureSettings.java   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename doze/src/org/lineageos/settings/{device => doze}/BootCompletedReceiver.java (96%)
 rename doze/src/org/lineageos/settings/{device => doze}/SamsungDozeActivity.java (96%)
 rename doze/src/org/lineageos/settings/{device => doze}/SamsungDozeService.java (99%)
 rename doze/src/org/lineageos/settings/{device => doze}/TouchscreenGestureSettings.java (98%)

diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml
index 060ad2c2..f493b33f 100644
--- a/doze/AndroidManifest.xml
+++ b/doze/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.lineageos.settings.device"
+    package="org.lineageos.settings.doze"
     android:versionCode="1"
     android:versionName="1.0"
     android:sharedUserId="android.uid.system">
diff --git a/doze/proguard.flags b/doze/proguard.flags
index ca04a219..37c5c912 100644
--- a/doze/proguard.flags
+++ b/doze/proguard.flags
@@ -1,4 +1,4 @@
--keep class org.lineageos.settings.device.* {
+-keep class org.lineageos.settings.doze.* {
   *;
 }
 
diff --git a/doze/src/org/lineageos/settings/device/BootCompletedReceiver.java b/doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
similarity index 96%
rename from doze/src/org/lineageos/settings/device/BootCompletedReceiver.java
rename to doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
index fa8de8e8..8640134f 100644
--- a/doze/src/org/lineageos/settings/device/BootCompletedReceiver.java
+++ b/doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.lineageos.settings.device;
+package org.lineageos.settings.doze;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/doze/src/org/lineageos/settings/device/SamsungDozeActivity.java b/doze/src/org/lineageos/settings/doze/SamsungDozeActivity.java
similarity index 96%
rename from doze/src/org/lineageos/settings/device/SamsungDozeActivity.java
rename to doze/src/org/lineageos/settings/doze/SamsungDozeActivity.java
index 571f34a6..70856b68 100644
--- a/doze/src/org/lineageos/settings/device/SamsungDozeActivity.java
+++ b/doze/src/org/lineageos/settings/doze/SamsungDozeActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lineageos.settings.device;
+package org.lineageos.settings.doze;
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
diff --git a/doze/src/org/lineageos/settings/device/SamsungDozeService.java b/doze/src/org/lineageos/settings/doze/SamsungDozeService.java
similarity index 99%
rename from doze/src/org/lineageos/settings/device/SamsungDozeService.java
rename to doze/src/org/lineageos/settings/doze/SamsungDozeService.java
index fc3f2d01..063b121d 100644
--- a/doze/src/org/lineageos/settings/device/SamsungDozeService.java
+++ b/doze/src/org/lineageos/settings/doze/SamsungDozeService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.lineageos.settings.device;
+package org.lineageos.settings.doze;
 
 import android.app.Service;
 import android.content.BroadcastReceiver;
diff --git a/doze/src/org/lineageos/settings/device/TouchscreenGestureSettings.java b/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java
similarity index 98%
rename from doze/src/org/lineageos/settings/device/TouchscreenGestureSettings.java
rename to doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java
index 44c9b942..142f845b 100644
--- a/doze/src/org/lineageos/settings/device/TouchscreenGestureSettings.java
+++ b/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.lineageos.settings.device;
+package org.lineageos.settings.doze;
 
 import android.app.ActionBar;
 import android.os.Bundle;