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

Commit f4c81035 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b168904199-qs-injection" 

* changes:
  5/N Move QS Tile tracking logic into QSPanelControllerBase.
  4/N Add QSPanelControllerBase
  3/N Remove UserTracker from QSPanel
  2/N Remove BroadcastDispatcher from QSPanel
  1/N Add QSFragmentComponent
parents ae31181f 3834b11c

packages/SystemUI/src/com/android/keyguard/KeyguardRootViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.keyguard; 
import android.view.ViewGroup;



import com.android.keyguard.dagger.KeyguardBouncerScope;

import com.android.keyguard.dagger.RootView;

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

import com.android.systemui.statusbar.phone.KeyguardBouncer;

import com.android.systemui.util.ViewController;

packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.keyguard.KeyguardMessageArea; 
import com.android.keyguard.KeyguardSecurityContainer;

import com.android.keyguard.KeyguardSecurityViewFlipper;

import com.android.systemui.R;

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

import com.android.systemui.statusbar.phone.KeyguardBouncer;



import dagger.Module;

packages/SystemUI/src/com/android/keyguard/dagger/RootView.java→packages/SystemUI/src/com/android/systemui/dagger/qualifiers/RootView.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 * Copyright (C) 2020 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.keyguard.dagger;

package com.android.systemui.dagger.qualifiers;



import static java.lang.annotation.RetentionPolicy.RUNTIME;

packages/SystemUI/src/com/android/systemui/qs/DoubleLineTileLayout.kt

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class DoubleLineTileLayout( 
        private const val NUM_LINES = 2

    }



    protected val mRecords = ArrayList<QSPanel.TileRecord>()

    protected val mRecords = ArrayList<QSPanelControllerBase.TileRecord>()

    private var _listening = false

    private var smallTileSize = 0

    private val twoLineHeight
@@ -50,17 +50,17 @@ class DoubleLineTileLayout( 
        updateResources()

    }



    override fun addTile(tile: QSPanel.TileRecord) {

    override fun addTile(tile: QSPanelControllerBase.TileRecord) {

        mRecords.add(tile)

        tile.tile.setListening(this, _listening)

        addTileView(tile)

    }



    protected fun addTileView(tile: QSPanel.TileRecord) {

    protected fun addTileView(tile: QSPanelControllerBase.TileRecord) {

        addView(tile.tileView)

    }



    override fun removeTile(tile: QSPanel.TileRecord) {

    override fun removeTile(tile: QSPanelControllerBase.TileRecord) {

        mRecords.remove(tile)

        tile.tile.setListening(this, false)

        removeView(tile.tileView)
@@ -72,7 +72,7 @@ class DoubleLineTileLayout( 
        super.removeAllViews()

    }



    override fun getOffsetTop(tile: QSPanel.TileRecord?) = top

    override fun getOffsetTop(tile: QSPanelControllerBase.TileRecord?) = top



    override fun updateResources(): Boolean {

        with(mContext.resources) {

packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.systemui.R;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.qs.QSPanel.QSTileLayout;

import com.android.systemui.qs.QSPanel.TileRecord;

import com.android.systemui.qs.QSPanelControllerBase.TileRecord;



import java.util.ArrayList;

import java.util.Set;