diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 20482b7c102..999e2d12089 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -448,7 +448,7 @@ diff --git a/src/com/android/settings/applications/AppOpsCategory.java b/src/com/android/settings/applications/appops/AppOpsCategory.java similarity index 96% rename from src/com/android/settings/applications/AppOpsCategory.java rename to src/com/android/settings/applications/appops/AppOpsCategory.java index 5b0337b803f..b506ce0ad7a 100644 --- a/src/com/android/settings/applications/AppOpsCategory.java +++ b/src/com/android/settings/applications/appops/AppOpsCategory.java @@ -1,20 +1,20 @@ -/** +/* * Copyright (C) 2013 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 + * 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 + * 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. + * 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.applications; +package com.android.settings.applications.appops; import android.app.AppOpsManager; import android.app.ListFragment; @@ -39,7 +39,7 @@ import android.widget.Switch; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.applications.AppOpsState.AppOpEntry; +import com.android.settings.applications.appops.AppOpsState.AppOpEntry; import java.util.List; diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/appops/AppOpsState.java similarity index 98% rename from src/com/android/settings/applications/AppOpsState.java rename to src/com/android/settings/applications/appops/AppOpsState.java index 7f002e2a6b9..2686b8c144b 100644 --- a/src/com/android/settings/applications/AppOpsState.java +++ b/src/com/android/settings/applications/appops/AppOpsState.java @@ -1,20 +1,20 @@ -/** +/* * Copyright (C) 2013 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 + * 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 + * 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. + * 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.applications; +package com.android.settings.applications.appops; import android.app.AppOpsManager; import android.content.Context; diff --git a/src/com/android/settings/applications/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java similarity index 83% rename from src/com/android/settings/applications/BackgroundCheckSummary.java rename to src/com/android/settings/applications/appops/BackgroundCheckSummary.java index f2dd1a9e384..f46e6a4361a 100644 --- a/src/com/android/settings/applications/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -1,20 +1,20 @@ -/** +/* * 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 + * 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 + * 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. + * 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.applications; +package com.android.settings.applications.appops; import android.annotation.Nullable; import android.app.FragmentTransaction; diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/grandfather_not_implementing_instrumentable index 64b5c83bd05..54f906dbad1 100644 --- a/tests/robotests/assets/grandfather_not_implementing_instrumentable +++ b/tests/robotests/assets/grandfather_not_implementing_instrumentable @@ -1,5 +1,5 @@ com.android.settings.deletionhelper.ActivationWarningFragment -com.android.settings.applications.AppOpsCategory +com.android.settings.applications.appops.AppOpsCategory com.android.settings.inputmethod.UserDictionaryLocalePicker com.android.settings.CustomListPreference$CustomListPreferenceDialogFragment com.android.settings.password.ChooseLockPassword$SaveAndFinishWorker