Updating content of page description frequently.
> Removing unused search icon page indicator issue: 17256565 Change-Id: I95158cf68f98b2af847cefb4d126468b908301e2
This commit is contained in:
parent
d750f8b3f7
commit
4cbf046bf9
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB |
|
@ -1,39 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Copyright (C) 2013 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.
|
|
||||||
-->
|
|
||||||
<com.android.launcher3.PageIndicatorMarker
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
|
|
||||||
android:layout_width="16dp"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:layout_gravity="center_vertical">
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/inactive"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:scaleType="centerInside"
|
|
||||||
android:src="@drawable/custom_content_page"
|
|
||||||
/>
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/active"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:scaleType="centerInside"
|
|
||||||
android:src="@drawable/custom_content_page"
|
|
||||||
android:alpha="0"
|
|
||||||
android:scaleX="0.5"
|
|
||||||
android:scaleY="0.5"
|
|
||||||
/>
|
|
||||||
</com.android.launcher3.PageIndicatorMarker>
|
|
|
@ -594,10 +594,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
|
||||||
|
|
||||||
private void updatePageIndicator() {
|
private void updatePageIndicator() {
|
||||||
// Update the page indicator (when we aren't reordering)
|
// Update the page indicator (when we aren't reordering)
|
||||||
if (mPageIndicator != null && !isReordering(false)) {
|
if (mPageIndicator != null) {
|
||||||
|
mPageIndicator.setContentDescription(getPageIndicatorDescription());
|
||||||
|
if (!isReordering(false)) {
|
||||||
mPageIndicator.setActiveMarker(getNextPage());
|
mPageIndicator.setActiveMarker(getNextPage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
protected void pageBeginMoving() {
|
protected void pageBeginMoving() {
|
||||||
if (!mIsPageMoving) {
|
if (!mIsPageMoving) {
|
||||||
mIsPageMoving = true;
|
mIsPageMoving = true;
|
||||||
|
|
|
@ -1274,9 +1274,6 @@ public class Workspace extends SmoothPagedView
|
||||||
mLauncher.updateVoiceButtonProxyVisible(false);
|
mLauncher.updateVoiceButtonProxyVisible(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (getPageIndicator() != null) {
|
|
||||||
getPageIndicator().setContentDescription(getPageIndicatorDescription());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected CustomContentCallbacks getCustomContentCallbacks() {
|
protected CustomContentCallbacks getCustomContentCallbacks() {
|
||||||
|
|
Loading…
Reference in New Issue