Move horizontal progress bar into SettingsLib.
Remove the horizontal progress bar as it is being moved into SettingsLib. Bug: 123538370 Test: See progress bar in wifi settings screen. Change-Id: I8fc94b1f3a7a52559cfcf89f3e4a604784ec9995
This commit is contained in:
Joel Galenson
@@ -1,28 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Copyright (C) 2015 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Variant of progress_indeterminate_horizontal_material in frameworks/base/core/res, which
|
|
||||||
draws the whole height of the progress bar instead having blank space above and below the
|
|
||||||
bar. -->
|
|
||||||
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:drawable="@drawable/vector_drawable_progress_indeterminate_horizontal_trimmed" >
|
|
||||||
<target
|
|
||||||
android:name="rect2_grp"
|
|
||||||
android:animation="@*android:anim/progress_indeterminate_horizontal_rect2" />
|
|
||||||
<target
|
|
||||||
android:name="rect1_grp"
|
|
||||||
android:animation="@*android:anim/progress_indeterminate_horizontal_rect1" />
|
|
||||||
</animated-vector>
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Copyright (C) 2015 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Variant of vector_drawable_progress_indeterminate_horizontal in frameworks/base/core/res, which
|
|
||||||
draws the whole height of the progress bar instead having blank space above and below the
|
|
||||||
bar. -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:height="10dp"
|
|
||||||
android:width="360dp"
|
|
||||||
android:viewportHeight="10"
|
|
||||||
android:viewportWidth="360" >
|
|
||||||
<group
|
|
||||||
android:name="progress_group"
|
|
||||||
android:translateX="180"
|
|
||||||
android:translateY="5" >
|
|
||||||
<path
|
|
||||||
android:name="background_track"
|
|
||||||
android:pathData="M -180.0,-5.0 l 360.0,0 l 0,10.0 l -360.0,0 Z"
|
|
||||||
android:fillColor="?android:attr/colorControlActivated"
|
|
||||||
android:fillAlpha="?android:attr/disabledAlpha"/>
|
|
||||||
<group
|
|
||||||
android:name="rect2_grp"
|
|
||||||
android:translateX="-197.60001"
|
|
||||||
android:scaleX="0.1" >
|
|
||||||
<path
|
|
||||||
android:name="rect2"
|
|
||||||
android:pathData="M -144.0,-5.0 l 288.0,0 l 0,10.0 l -288.0,0 Z"
|
|
||||||
android:fillColor="?android:attr/colorControlActivated" />
|
|
||||||
</group>
|
|
||||||
<group
|
|
||||||
android:name="rect1_grp"
|
|
||||||
android:translateX="-522.59998"
|
|
||||||
android:scaleX="0.1" >
|
|
||||||
<path
|
|
||||||
android:name="rect1"
|
|
||||||
android:pathData="M -144.0,-5.0 l 288.0,0 l 0,10.0 l -288.0,0 Z"
|
|
||||||
android:fillColor="?android:attr/colorControlActivated" />
|
|
||||||
</group>
|
|
||||||
</group>
|
|
||||||
</vector>
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2015 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="3dp"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<View
|
|
||||||
android:id="@+id/progress_bar_background"
|
|
||||||
style="@style/TrimmedHorizontalProgressBar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="?android:attr/colorSecondary" />
|
|
||||||
<ProgressBar
|
|
||||||
android:id="@+id/progress_bar_animation"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
style="@style/TrimmedHorizontalProgressBar"
|
|
||||||
android:indeterminate="true" />
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -82,15 +82,6 @@
|
|||||||
<item name="android:scrollbarStyle">outsideOverlay</item>
|
<item name="android:scrollbarStyle">outsideOverlay</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TrimmedHorizontalProgressBar"
|
|
||||||
parent="android:Widget.Material.ProgressBar.Horizontal">
|
|
||||||
<item name="android:indeterminateDrawable">
|
|
||||||
@drawable/progress_indeterminate_horizontal_material_trimmed
|
|
||||||
</item>
|
|
||||||
<item name="android:minHeight">3dip</item>
|
|
||||||
<item name="android:maxHeight">3dip</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="bt_item">
|
<style name="bt_item">
|
||||||
<item name="android:layout_width">match_parent</item>
|
<item name="android:layout_width">match_parent</item>
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ public class NetworkSelectSettings extends DashboardFragment {
|
|||||||
|
|
||||||
final Activity activity = getActivity();
|
final Activity activity = getActivity();
|
||||||
if (activity != null) {
|
if (activity != null) {
|
||||||
mProgressHeader = setPinnedHeaderView(R.layout.wifi_progress_header)
|
mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
|
||||||
.findViewById(R.id.progress_bar_animation);
|
.findViewById(R.id.progress_bar_animation);
|
||||||
setProgressBarVisible(false);
|
setProgressBarVisible(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -203,7 +203,7 @@ public class WifiSettings extends RestrictedSettingsFragment
|
|||||||
super.onViewCreated(view, savedInstanceState);
|
super.onViewCreated(view, savedInstanceState);
|
||||||
final Activity activity = getActivity();
|
final Activity activity = getActivity();
|
||||||
if (activity != null) {
|
if (activity != null) {
|
||||||
mProgressHeader = setPinnedHeaderView(R.layout.wifi_progress_header)
|
mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
|
||||||
.findViewById(R.id.progress_bar_animation);
|
.findViewById(R.id.progress_bar_animation);
|
||||||
setProgressBarVisible(false);
|
setProgressBarVisible(false);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user