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

Commit 55066bb4 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Trivial test package refactoring. 

These common test base classes belong under the `widget` package
where they're actually used; placing them under `util` is a layering
violation.

Bug: 292141694
Test: TH
Change-Id: I3f3e1ae1cc8e3b0f92295742483dd53c2f28cec9
parent 256d9070

core/tests/coretests/src/android/view/menu/MenuScenario.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.view.menu; 


import android.app.Activity;

import android.os.Bundle;

import android.util.ListScenario;

import android.widget.ListScenario;

import android.util.SparseArray;

import android.view.Menu;

import android.view.MenuItem;

core/tests/coretests/src/android/util/GridScenario.java→core/tests/coretests/src/android/widget/GridScenario.java

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

 * Copyright (C) 2007 The Android Open Source Project

 * 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.util;

package android.widget;



import android.app.Activity;

import android.os.Bundle;

core/tests/coretests/src/android/util/InternalSelectionView.java→core/tests/coretests/src/android/widget/InternalSelectionView.java

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

 * Copyright (C) 2007 The Android Open Source Project

 * 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.util;

package android.widget;



import android.content.Context;

import android.content.res.TypedArray;
@@ -22,6 +22,7 @@ import android.graphics.Canvas; 
import android.graphics.Color;

import android.graphics.Paint;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.view.KeyEvent;

import android.view.View;

core/tests/coretests/src/android/util/ListScenario.java→core/tests/coretests/src/android/widget/ListScenario.java

+3 −8
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 The Android Open Source Project

 * 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.
@@ -14,20 +14,15 @@ 
 * limitations under the License.

 */



package android.util;

package android.widget;



import android.app.Activity;

import android.graphics.Rect;

import android.os.Bundle;

import android.util.ListItemFactory;

import android.view.View;

import android.view.ViewGroup;

import android.view.Window;

import android.widget.AdapterView;

import android.widget.BaseAdapter;

import android.widget.EditText;

import android.widget.LinearLayout;

import android.widget.ListView;

import android.widget.TextView;



import com.google.android.collect.Maps;

core/tests/coretests/src/android/util/ScrollViewScenario.java→core/tests/coretests/src/android/widget/ScrollViewScenario.java

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

 * Copyright (C) 2008 The Android Open Source Project

 * 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.util;

package android.widget;



import android.app.Activity;

import android.content.Context;
@@ -23,6 +23,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.Window;

import android.widget.Button;

import android.widget.InternalSelectionView;

import android.widget.LinearLayout;

import android.widget.ScrollView;

import android.widget.TextView;