summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/main
diff options
context:
space:
mode:
authorzachh <zachh@google.com>2018-03-23 11:43:18 -0700
committerCopybara-Service <copybara-piper@google.com>2018-03-26 22:18:34 -0700
commitd74e72e59795d39836a893afb60447acce9e9886 (patch)
tree486b705cedb559d53027efe1db1db9a9968a0baf /java/com/android/dialer/main
parentb9b64d3935bb05169afb23375ebe38fb846e78c8 (diff)
Removed NUI shortcut.
We're not going to have a shortcut for NUI anymore. There are individual flags related to NUI that are controlled in CallLogConfig. Other related changes to help accomplish this: -Changed how the call log framework/config/migrator interact; the migrator is now only called on config changes and enabling/disabling of the framework now lives in CallLogFramework. -Move CallLogConfig an interface, and moved it to its own package and added component and module. This is to simplify tests which just need to check the config status (like PhoneLookupHistoryRecorderTest). -The "Main" package is also on longer needed since it existed to control the shortcut. Bug: 74821995 Test: existing PiperOrigin-RevId: 190251418 Change-Id: I73c8e83aee80295131443a8ffaa7dea716ea89b6
Diffstat (limited to 'java/com/android/dialer/main')
-rw-r--r--java/com/android/dialer/main/Main.java30
-rw-r--r--java/com/android/dialer/main/MainComponent.java39
-rw-r--r--java/com/android/dialer/main/impl/MainImpl.java65
-rw-r--r--java/com/android/dialer/main/impl/MainModule.java30
4 files changed, 0 insertions, 164 deletions
diff --git a/java/com/android/dialer/main/Main.java b/java/com/android/dialer/main/Main.java
deleted file mode 100644
index e7295f199..000000000
--- a/java/com/android/dialer/main/Main.java
+++ /dev/null
@@ -1,30 +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.dialer.main;
-
-import android.content.Context;
-
-/** Used to display the main activity for Dialer. This hosts favorites, dial pad, search, etc... */
-public interface Main {
-
- boolean isNewUiEnabled(Context context);
-
- // TODO(38502365): Remove this when we're ready to launch the new UI. */
- void createNewUiLauncherShortcut(Context context);
-
- void disableComponentForTesting(Context context);
-}
diff --git a/java/com/android/dialer/main/MainComponent.java b/java/com/android/dialer/main/MainComponent.java
deleted file mode 100644
index e735457f4..000000000
--- a/java/com/android/dialer/main/MainComponent.java
+++ /dev/null
@@ -1,39 +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.dialer.main;
-
-import android.content.Context;
-import com.android.dialer.inject.HasRootComponent;
-import com.android.dialer.main.impl.MainModule;
-import dagger.Subcomponent;
-
-/** Subcomponent that can be used to access the main implementation. */
-@Subcomponent(modules = MainModule.class)
-public abstract class MainComponent {
-
- public abstract Main getMain();
-
- public static MainComponent get(Context context) {
- return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
- .mainComponent();
- }
-
- /** Used to refer to the root application component. */
- public interface HasComponent {
- MainComponent mainComponent();
- }
-}
diff --git a/java/com/android/dialer/main/impl/MainImpl.java b/java/com/android/dialer/main/impl/MainImpl.java
deleted file mode 100644
index 717350e5f..000000000
--- a/java/com/android/dialer/main/impl/MainImpl.java
+++ /dev/null
@@ -1,65 +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.dialer.main.impl;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.main.Main;
-import javax.inject.Inject;
-
-/** The entry point for the main feature. */
-final class MainImpl implements Main {
-
- @Inject
- MainImpl() {}
-
- @Override
- public boolean isNewUiEnabled(Context context) {
- return ConfigProviderBindings.get(context).getBoolean("is_nui_shortcut_enabled", false);
- }
-
- @Override
- public void createNewUiLauncherShortcut(Context context) {
- enableComponent(context);
- }
-
- /**
- * Enables the NUI activity component. By default the component is disabled and can't be accessed.
- * Once the component has been enabled the user will get an option to use the new UI to handle
- * DIAL (and other) intents.
- */
- private static void enableComponent(Context context) {
- context
- .getPackageManager()
- .setComponentEnabledSetting(
- new ComponentName(context, MainActivity.class),
- PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
- PackageManager.DONT_KILL_APP);
- }
-
- @Override
- public void disableComponentForTesting(Context context) {
- context
- .getPackageManager()
- .setComponentEnabledSetting(
- new ComponentName(context, MainActivity.class),
- PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
- PackageManager.DONT_KILL_APP);
- }
-}
diff --git a/java/com/android/dialer/main/impl/MainModule.java b/java/com/android/dialer/main/impl/MainModule.java
deleted file mode 100644
index 90342cf59..000000000
--- a/java/com/android/dialer/main/impl/MainModule.java
+++ /dev/null
@@ -1,30 +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.dialer.main.impl;
-
-import com.android.dialer.main.Main;
-import dagger.Module;
-import dagger.Provides;
-
-/** This module provides an instance of {@link Main}. */
-@Module
-public final class MainModule {
- @Provides
- public static Main provideMain() {
- return new MainImpl();
- }
-}