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

Commit 1f9c39fb authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Refactor Complication package out of Dream." into udc-dev am: ea19db83 

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



Change-Id: I837a59eb34deb0e58bf1f39cf35d11c5b91be6c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40846453 ea19db83

packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java→packages/SystemUI/src/com/android/systemui/complication/Complication.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.dreams.complication;

package com.android.systemui.complication;



import android.annotation.IntDef;

import android.view.View;

packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveData.java→packages/SystemUI/src/com/android/systemui/complication/ComplicationCollectionLiveData.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.dreams.complication;

package com.android.systemui.complication;



import androidx.lifecycle.LiveData;

packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationCollectionViewModel.java→packages/SystemUI/src/com/android/systemui/complication/ComplicationCollectionViewModel.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.dreams.complication;

package com.android.systemui.complication;



import androidx.lifecycle.LiveData;

import androidx.lifecycle.Transformations;

packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java→packages/SystemUI/src/com/android/systemui/complication/ComplicationHostViewController.java

+3 −3
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 
 * limitations under the License.

 */



package com.android.systemui.dreams.complication;

package com.android.systemui.complication;



import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.SCOPED_COMPLICATIONS_LAYOUT;

import static com.android.systemui.dreams.complication.dagger.ComplicationModule.SCOPED_COMPLICATIONS_MODEL;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.SCOPED_COMPLICATIONS_LAYOUT;

import static com.android.systemui.complication.dagger.ComplicationModule.SCOPED_COMPLICATIONS_MODEL;



import android.graphics.Rect;

import android.graphics.Region;

packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationId.java→packages/SystemUI/src/com/android/systemui/complication/ComplicationId.java

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui.dreams.complication;

package com.android.systemui.complication;



/**

 * A {@link ComplicationId} is a value to uniquely identify a complication during the current