Merge "Repackage nav bar code into view and controller logic separately" into main (c2b3e96c) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ filegroup {
		"tests/src/**/systemui/media/dialog/MediaOutputDialogTest.java",
		"tests/src/**/systemui/media/controls/domain/resume/MediaResumeListenerTest.kt",
		"tests/src/**/systemui/mediaprojection/taskswitcher/ui/TaskSwitcherNotificationCoordinatorTest.kt",
		"tests/src/**/systemui/navigationbar/NavigationBarButtonTest.java",
		"tests/src/**/systemui/navigationbar/views/NavigationBarButtonTest.java",
		"tests/src/**/systemui/people/PeopleProviderTest.java",
		"tests/src/**/systemui/people/PeopleSpaceUtilsTest.java",
		"tests/src/**/systemui/people/widget/PeopleSpaceWidgetManagerTest.java",
		@@ -449,7 +449,7 @@ filegroup {
		"tests/src/**/systemui/doze/DozeScreenStateTest.java",
		"tests/src/**/systemui/keyguard/WorkLockActivityControllerTest.java",
		"tests/src/**/systemui/media/dialog/MediaOutputControllerTest.java",
		"tests/src/**/systemui/navigationbar/NavigationBarTest.java",
		"tests/src/**/systemui/navigationbar/views/NavigationBarTest.java",
		"tests/src/**/systemui/power/PowerNotificationWarningsTest.java",
		"tests/src/**/systemui/power/PowerUITest.java",
		"tests/src/**/systemui/qs/QSFooterViewControllerTest.java",

packages/SystemUI/lint-baseline.xml

+17 −17

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@
		errorLine1=" mUserTracker.addCallback(mUserChangedCallback, mContext.getMainExecutor());"
		errorLine2=" ~~~~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java"
		line="807"
		column="65"/>
		</issue>
		@@ -1646,7 +1646,7 @@
		errorLine1=" mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);"
		errorLine2=" ~~~~~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java"
		line="177"
		column="48"/>
		</issue>
		@@ -2086,7 +2086,7 @@
		errorLine1=" WindowManager wm = getContext().getSystemService(WindowManager.class);"
		errorLine2=" ~~~~~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java"
		line="729"
		column="45"/>
		</issue>
		@@ -2097,7 +2097,7 @@
		errorLine1=" WindowManager wm = getContext().getSystemService(WindowManager.class);"
		errorLine2=" ~~~~~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java"
		line="830"
		column="41"/>
		</issue>
		@@ -4049,7 +4049,7 @@
		errorLine1=" pw.println(String.format(" mCurrentView: id=%s (%dx%d) %s %f","
		errorLine2=" ^">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java"
		line="1128"
		column="20"/>
		</issue>
		@@ -4060,7 +4060,7 @@
		errorLine1=" pw.println(String.format(" disabled=0x%08x vertical=%s darkIntensity=%.2f","
		errorLine2=" ^">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java"
		line="1134"
		column="20"/>
		</issue>
		@@ -4668,7 +4668,7 @@
		errorLine1=" 500).show();"
		errorLine2=" ~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java"
		line="1894"
		column="21"/>
		</issue>
		@@ -8386,7 +8386,7 @@
		errorLine1=" mUiEventLogger.log(KeyButtonView.NavBarButtonEvent.NAVBAR_IME_SWITCHER_BUTTON_TAP);"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java"
		line="1500"
		column="60"/>
		</issue>
		@@ -23055,7 +23055,7 @@
		errorLine1=" mBarTransitions.setBackgroundFrame(new Rect(0, frameHeight - height, w, h));"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java"
		line="1001"
		column="48"/>
		</issue>
		@@ -25002,7 +25002,7 @@
		errorLine1=" mAudioManager.playSoundEffect(soundConstant, ActivityManager.getCurrentUser());"
		errorLine2=" ~~~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java"
		line="373"
		column="70"/>
		</issue>
		@@ -25222,7 +25222,7 @@
		errorLine1=" Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);"
		errorLine2=" ~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonDrawable.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonDrawable.java"
		line="329"
		column="74"/>
		</issue>
		@@ -25233,7 +25233,7 @@
		errorLine1=" Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);"
		errorLine2=" ~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonDrawable.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonDrawable.java"
		line="357"
		column="74"/>
		</issue>
		@@ -25827,7 +25827,7 @@
		errorLine1=" new AsyncTask<Icon, Void, Drawable>() {"
		errorLine2=" ^">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java"
		line="207"
		column="9"/>
		</issue>
		@@ -29303,7 +29303,7 @@
		errorLine1=" public boolean onTouchEvent(MotionEvent ev) {"
		errorLine2=" ~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java"
		line="267"
		column="20"/>
		</issue>
		@@ -29578,7 +29578,7 @@
		errorLine1=" mView.setOnTouchListener(this::onNavigationTouch);"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java"
		line="782"
		column="9"/>
		</issue>
		@@ -29589,7 +29589,7 @@
		errorLine1=" public boolean onTouchEvent(MotionEvent event) {"
		errorLine2=" ~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBarView.java"
		line="383"
		column="20"/>
		</issue>
		@@ -29600,7 +29600,7 @@
		errorLine1=" public boolean onTouchEvent(MotionEvent event) {"
		errorLine2=" ~~~~~~~~~~~~">
		<location
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/NearestTouchFrame.java"
		file="frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/NearestTouchFrame.java"
		line="207"
		column="20"/>
		</issue>

packages/SystemUI/res/layout/back.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		limitations under the License.
		-->

		<com.android.systemui.navigationbar.buttons.KeyButtonView
		<com.android.systemui.navigationbar.views.buttons.KeyButtonView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:systemui="http://schemas.android.com/apk/res-auto"
		android:id="@+id/back"

packages/SystemUI/res/layout/contextual.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		android:clipChildren="false"
		android:clipToPadding="false"
		>
		<com.android.systemui.navigationbar.buttons.KeyButtonView
		<com.android.systemui.navigationbar.views.buttons.KeyButtonView
		android:id="@+id/menu"
		android:layout_height="match_parent"
		android:layout_width="match_parent"
		@@ -47,7 +47,7 @@
		android:layout_height="match_parent"
		android:visibility="invisible"
		/>
		<com.android.systemui.navigationbar.buttons.KeyButtonView
		<com.android.systemui.navigationbar.views.buttons.KeyButtonView
		android:id="@+id/accessibility_button"
		android:layout_width="match_parent"
		android:layout_height="match_parent"

packages/SystemUI/res/layout/custom_key.xml

+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.
		-->
		<com.android.systemui.navigationbar.buttons.KeyButtonView
		<com.android.systemui.navigationbar.views.buttons.KeyButtonView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:systemui="http://schemas.android.com/apk/res-auto"
		android:layout_width="@dimen/navigation_side_padding"