From 5db43105e8f489482e60b3b12ebedf09ee732eaa Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 15 Mar 2019 15:10:16 -0700
Subject: [PATCH] Move a few classes around for easier ownership control

Bug: 128547723
Test: rebuild
Change-Id: I8f0dcf30fee44eaae60e10510620fb518cded68f
---
 res/xml/special_access.xml                                      | 2 +-
 .../settings/applications/specialaccess/zenaccess/OWNERS        | 2 ++
 .../specialaccess/{ => zenaccess}/ZenAccessController.java      | 2 +-
 .../specialaccess/{ => zenaccess}/ZenAccessControllerTest.java  | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 src/com/android/settings/applications/specialaccess/zenaccess/OWNERS
 rename src/com/android/settings/applications/specialaccess/{ => zenaccess}/ZenAccessController.java (95%)
 rename tests/robotests/src/com/android/settings/applications/specialaccess/{ => zenaccess}/ZenAccessControllerTest.java (96%)

diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 05f4a81ef2a..9be01f9fd1c 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -53,7 +53,7 @@
         android:key="zen_access"
         android:title="@string/manage_zen_access_title"
         android:fragment="com.android.settings.notification.ZenAccessSettings"
-        settings:controller="com.android.settings.applications.specialaccess.ZenAccessController" />
+        settings:controller="com.android.settings.applications.specialaccess.zenaccess.ZenAccessController" />
 
     <Preference
         android:key="write_settings_apps"
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/OWNERS b/src/com/android/settings/applications/specialaccess/zenaccess/OWNERS
new file mode 100644
index 00000000000..9b5f41ef32c
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/OWNERS
@@ -0,0 +1,2 @@
+beverlyt@google.com
+juliacr@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/ZenAccessController.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
similarity index 95%
rename from src/com/android/settings/applications/specialaccess/ZenAccessController.java
rename to src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
index 5ae2bd3c903..88d444d485c 100644
--- a/src/com/android/settings/applications/specialaccess/ZenAccessController.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.zenaccess;
 
 import android.app.ActivityManager;
 import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java
rename to tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
index 5bce86c386c..bcb4bb3bf4a 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.zenaccess;
 
 import static com.google.common.truth.Truth.assertThat;