Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3fda9ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ie36c8935,If96a44ce 

* changes:
  Match redlines in new call log.
  Missed calls now go to MainActivity if you have the component enabled.
parents 0901d591 4c185f69

assets/quantum/res/drawable/quantum_ic_call_made_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 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

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M9,5v2h6.59L4,18.59 5.41,20 17,8.41V15h2V5z"/>

</vector>

assets/quantum/res/drawable/quantum_ic_call_missed_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 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

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M19.59,7L12,14.59 6.41,9H11V7H3v8h2v-4.59l7,7 9,-9z"/>

</vector>

assets/quantum/res/drawable/quantum_ic_call_received_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 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

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M20,5.41L18.59,4 7,15.59V9H5v10h10v-2H8.41z"/>

</vector>

assets/quantum/res/drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 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

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>

</vector>

java/com/android/dialer/app/MainComponent.java

+24 −2
Original line number Diff line number Diff line
@@ -46,6 +46,16 @@ public class MainComponent { 
    }

  }



  public static boolean isNuiComponentEnabled(Context context) {

    if (!isNewUiEnabled(context)) {

      return false;

    }

    return context

            .getPackageManager()

            .getComponentEnabledSetting(new ComponentName(context, getComponentName()))

        == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;

  }



  /**

   * 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
@@ -55,7 +65,7 @@ public class MainComponent { 
    context

        .getPackageManager()

        .setComponentEnabledSetting(

            new ComponentName(context, "com.android.dialer.main.impl.MainActivity"),

            new ComponentName(context, getComponentName()),

            PackageManager.COMPONENT_ENABLED_STATE_ENABLED,

            PackageManager.DONT_KILL_APP);

  }
@@ -87,9 +97,21 @@ public class MainComponent { 
   */

  public static Intent getIntent(Context context) {

    Intent intent = new Intent();

    intent.setComponent(new ComponentName(context, "com.android.dialer.main.impl.MainActivity"));

    intent.setComponent(new ComponentName(context, getComponentName()));

    intent.setAction(Intent.ACTION_VIEW);

    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

    return intent;

  }



  public static Intent getShowCallLogIntent(Context context) {

    Intent intent = new Intent();

    intent.setComponent(new ComponentName(context, getComponentName()));

    intent.setAction("ACTION_SHOW_TAB");

    intent.putExtra("EXTRA_SHOW_TAB", 1);

    return intent;

  }



  private static String getComponentName() {

    return "com.android.dialer.main.impl.MainActivity";

  }

}