From 715d25f7278f4d84e9fc5e34f2e60d81692cc0f7 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 22 May 2017 14:47:38 -0700 Subject: [PATCH] Remove lifecycle interfaces from settings. They are already moved to settingslib. Test: builds Change-Id: I581bdaff492bdb1e75c66fb69c803eb222f68b8b --- .../core/lifecycle/events/OnAttach.java | 22 ----------------- .../core/lifecycle/events/OnCreate.java | 23 ------------------ .../lifecycle/events/OnCreateOptionsMenu.java | 24 ------------------- .../core/lifecycle/events/OnDestroy.java | 20 ---------------- .../events/OnOptionsItemSelected.java | 23 ------------------ .../core/lifecycle/events/OnPause.java | 20 ---------------- .../events/OnPrepareOptionsMenu.java | 24 ------------------- .../core/lifecycle/events/OnResume.java | 20 ---------------- .../lifecycle/events/OnSaveInstanceState.java | 23 ------------------ .../core/lifecycle/events/OnStart.java | 21 ---------------- .../core/lifecycle/events/OnStop.java | 21 ---------------- .../lifecycle/events/SetPreferenceScreen.java | 24 ------------------- 12 files changed, 265 deletions(-) delete mode 100644 src/com/android/settings/core/lifecycle/events/OnAttach.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnCreate.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnDestroy.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnPause.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnResume.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnStart.java delete mode 100644 src/com/android/settings/core/lifecycle/events/OnStop.java delete mode 100644 src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java diff --git a/src/com/android/settings/core/lifecycle/events/OnAttach.java b/src/com/android/settings/core/lifecycle/events/OnAttach.java deleted file mode 100644 index 74fbe2f394f..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnAttach.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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.core.lifecycle.events; - -import android.content.Context; - -public interface OnAttach { - void onAttach(Context context); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnCreate.java b/src/com/android/settings/core/lifecycle/events/OnCreate.java deleted file mode 100644 index 9c97cf5f239..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnCreate.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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.core.lifecycle.events; - - -import android.os.Bundle; - -public interface OnCreate { - void onCreate(Bundle savedInstanceState); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java b/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java deleted file mode 100644 index 4c794ba8eab..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2017 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.core.lifecycle.events; - -import android.view.Menu; -import android.view.MenuInflater; - -public interface OnCreateOptionsMenu { - void onCreateOptionsMenu(Menu menu, MenuInflater inflater); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnDestroy.java b/src/com/android/settings/core/lifecycle/events/OnDestroy.java deleted file mode 100644 index 5499de82782..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnDestroy.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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.core.lifecycle.events; - -public interface OnDestroy { - void onDestroy(); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java b/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java deleted file mode 100644 index b34b407f415..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2017 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.core.lifecycle.events; - -import android.view.MenuItem; - -public interface OnOptionsItemSelected { - boolean onOptionsItemSelected(MenuItem menuItem); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnPause.java b/src/com/android/settings/core/lifecycle/events/OnPause.java deleted file mode 100644 index 155af00ce33..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnPause.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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.core.lifecycle.events; - -public interface OnPause { - void onPause(); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java b/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java deleted file mode 100644 index d64280764c0..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2017 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.core.lifecycle.events; - -import android.view.Menu; -import android.view.MenuInflater; - -public interface OnPrepareOptionsMenu { - void onPrepareOptionsMenu(Menu menu); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnResume.java b/src/com/android/settings/core/lifecycle/events/OnResume.java deleted file mode 100644 index 30ce42b15df..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnResume.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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.core.lifecycle.events; - -public interface OnResume { - void onResume(); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java b/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java deleted file mode 100644 index fab4041f9a9..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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.core.lifecycle.events; - -import android.os.Bundle; - - -public interface OnSaveInstanceState { - void onSaveInstanceState(Bundle outState); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnStart.java b/src/com/android/settings/core/lifecycle/events/OnStart.java deleted file mode 100644 index 3b4e6cc6928..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnStart.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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.core.lifecycle.events; - -public interface OnStart { - - void onStart(); -} diff --git a/src/com/android/settings/core/lifecycle/events/OnStop.java b/src/com/android/settings/core/lifecycle/events/OnStop.java deleted file mode 100644 index 8c19b87b173..00000000000 --- a/src/com/android/settings/core/lifecycle/events/OnStop.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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.core.lifecycle.events; - -public interface OnStop { - - void onStop(); -} diff --git a/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java b/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java deleted file mode 100644 index d206ed3cf38..00000000000 --- a/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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.core.lifecycle.events; - -import android.support.v7.preference.PreferenceScreen; - -public interface SetPreferenceScreen { - - void setPreferenceScreen(PreferenceScreen preferenceScreen); -}