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

Commit b527796d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I0eaf7473,Ib31a9bcb into udc-qpr-dev am: 7e79f078 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23782363



Change-Id: Icb7679555542b33a53cbb0b6e7fb639322a12209
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72826b9a 7e79f078

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
        <item><xliff:g id="id">@string/status_bar_secure</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_managed_profile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_cast</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_connected_display</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_screen_record</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_vpn</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_bluetooth</xliff:g></item>
@@ -72,6 +73,7 @@ 
    <string translatable="false" name="status_bar_sync_failing">sync_failing</string>

    <string translatable="false" name="status_bar_sync_active">sync_active</string>

    <string translatable="false" name="status_bar_cast">cast</string>

    <string translatable="false" name="status_bar_connected_display">connected_display</string>

    <string translatable="false" name="status_bar_hotspot">hotspot</string>

    <string translatable="false" name="status_bar_location">location</string>

    <string translatable="false" name="status_bar_bluetooth">bluetooth</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3101,6 +3101,7 @@ 
  <java-symbol type="string" name="status_bar_sync_failing" />

  <java-symbol type="string" name="status_bar_sync_active" />

  <java-symbol type="string" name="status_bar_cast" />

  <java-symbol type="string" name="status_bar_connected_display" />

  <java-symbol type="string" name="status_bar_hotspot" />

  <java-symbol type="string" name="status_bar_location" />

  <java-symbol type="string" name="status_bar_bluetooth" />

packages/SystemUI/res/drawable/stat_sys_connected_display.xml

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

Copyright (C) 2023 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:fillColor="@android:color/white"

    android:viewportWidth="960"

    android:viewportHeight="960">

    <path

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

        android:pathData="M320,840L320,760L400,760L400,680L160,680Q127,680 103.5,656.5Q80,633 80,600L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,600Q880,633 856.5,656.5Q833,680 800,680L560,680L560,760L640,760L640,840L320,840ZM160,600L800,600Q800,600 800,600Q800,600 800,600L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,600Q160,600 160,600Q160,600 160,600ZM160,600Q160,600 160,600Q160,600 160,600L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,600Q160,600 160,600Q160,600 160,600L160,600Z" />

</vector>
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.controls.dagger.ControlsModule; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dagger.qualifiers.SystemUser;

import com.android.systemui.demomode.dagger.DemoModeModule;

import com.android.systemui.display.DisplayModule;

import com.android.systemui.doze.dagger.DozeComponent;

import com.android.systemui.dreams.dagger.DreamModule;

import com.android.systemui.dump.DumpManager;
@@ -163,6 +164,7 @@ import javax.inject.Named; 
            ClipboardOverlayModule.class,

            ClockRegistryModule.class,

            CommonRepositoryModule.class,

            DisplayModule.class,

            ConnectivityModule.class,

            CoroutinesModule.class,

            DreamModule.class,

packages/SystemUI/src/com/android/systemui/display/DisplayModule.kt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.systemui.display



import com.android.systemui.display.data.repository.DisplayRepository

import com.android.systemui.display.data.repository.DisplayRepositoryImpl

import com.android.systemui.display.domain.interactor.ConnectedDisplayInteractor

import com.android.systemui.display.domain.interactor.ConnectedDisplayInteractorImpl

import dagger.Binds

import dagger.Module



/** Module binding display related classes. */

@Module

interface DisplayModule {

    @Binds

    fun bindConnectedDisplayInteractor(

        provider: ConnectedDisplayInteractorImpl

    ): ConnectedDisplayInteractor



    @Binds fun bindsDisplayRepository(displayRepository: DisplayRepositoryImpl): DisplayRepository

}