From 4671261f1c82c252e97714ed49f34d0845586c66 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Mon, 28 Dec 2015 14:18:48 +0100 Subject: [PATCH] Squashed merge of the material-polish branch --- assets/about.html | 11 - res/drawable/tab_focus.9.png | Bin 0 -> 190 bytes ...i__tab_indicator.xml => tab_indicator.xml} | 20 +- res/drawable/tab_selected.9.png | Bin 0 -> 186 bytes res/drawable/tab_unselected.9.png | Bin 0 -> 185 bytes res/layout/draggable_row.xml | 37 ++-- res/layout/filebrowser_content.xml | 5 +- res/layout/library_content.xml | 8 + res/layout/library_row_expandable.xml | 32 ++- res/layout/listview.xml | 3 +- res/values-v21/dimens.xml | 9 + res/values-v21/theme.xml | 51 ++--- res/values/attrs.xml | 1 - res/values/dimens.xml | 9 + res/values/theme.xml | 1 - .../android/vanilla/FileSystemAdapter.java | 7 +- .../android/vanilla/LibraryActivity.java | 2 - .../android/vanilla/LibraryPagerAdapter.java | 17 +- .../android/vanilla/MediaAdapter.java | 14 +- .../viewpagerindicator/TabPageIndicator.java | 205 ------------------ 20 files changed, 118 insertions(+), 314 deletions(-) create mode 100644 res/drawable/tab_focus.9.png rename res/drawable/{vpi__tab_indicator.xml => tab_indicator.xml} (55%) create mode 100644 res/drawable/tab_selected.9.png create mode 100644 res/drawable/tab_unselected.9.png create mode 100644 res/values-v21/dimens.xml create mode 100644 res/values/dimens.xml delete mode 100644 src/com/viewpagerindicator/TabPageIndicator.java diff --git a/assets/about.html b/assets/about.html index 76a2c8b2..fa739291 100644 --- a/assets/about.html +++ b/assets/about.html @@ -124,17 +124,6 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -

ViewPageIndicator [show]

-
-Copyright (C) 2011 The Android Open Source Project
-Copyright (C) 2011 Jake Wharton
-
-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.
-

DragSortListView [show]

 A subclass of the Android ListView component that enables drag
diff --git a/res/drawable/tab_focus.9.png b/res/drawable/tab_focus.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..59c4d19fd8a9b175cf72356b15708126933b41de
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ-0U~39{!9Z2Bze2LF#HF>1$&oI28wVNctjQh
zRds?eqxs3xYk`97C7!;n?Du)3galPDO~3aNDCF(w;us=vd2Qc8-Ub66=JP9rQ>LCf
z;UT;7{+a|ijwK-nx+nj!JneO)bEQW^?&_$@$ISLS*(S_9>c+w=uwnh=>(cgOUkukz
dfB(hMlHtZpVLeX6)=Z$W44$rjF6*2UngCm|KW+d3

literal 0
HcmV?d00001

diff --git a/res/drawable/vpi__tab_indicator.xml b/res/drawable/tab_indicator.xml
similarity index 55%
rename from res/drawable/vpi__tab_indicator.xml
rename to res/drawable/tab_indicator.xml
index 3775dd95..af6b524b 100644
--- a/res/drawable/vpi__tab_indicator.xml
+++ b/res/drawable/tab_indicator.xml
@@ -4,9 +4,9 @@
      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.
@@ -16,19 +16,13 @@
 
 
     
-    
-    
+    
+    
 
     
-    
-    
+    
+    
 
     
-    
-    
-    
-
-    
-    
-    
+    
 
diff --git a/res/drawable/tab_selected.9.png b/res/drawable/tab_selected.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..136e3cb93158debe4c57a7c5951efee070e82e6f
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ-0U~39{!9Z2Bze2LF#HF>1$&oI28wVNctjQh
zRds?eqxs3xYk`97C7!;n?Du)3gak#JJ?~ux3b}i_IEF}EUfXw&^MC;lv%jiv#ndzN
zCVu+Lb!zdJ1drdR8tv3ubn|>%nR249o)WjOcrN9TCMGRt;;{Sb^WJ9G+B46en%DY>
Z$xIPmarfY!D?lR|JYD@<);T3K0RY%yJtP1C

literal 0
HcmV?d00001

diff --git a/res/drawable/tab_unselected.9.png b/res/drawable/tab_unselected.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..890fd94a2aceaf2555c23715e363f3b12550b59b
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ-0U~39{!9Z2Bze2L0BIoj>AbrhNO2Z;L>2>8
zb%HRX`N`93fr9KMp1!W^_j#m*xY@VgO1%aYa`SX?43W6Jwr?Zn0RsVM|AWGRwC3Ga
z-uYMb$sv^w2~J%yD=bAP-I&qEa%0=7srqprPMS8H(J@mJsBSqgZ7=r4@cn83Uo&)e
X>5DC4Y4Y6+G?Bs6)z4*}Q$iB}L6ACQ

literal 0
HcmV?d00001

diff --git a/res/layout/draggable_row.xml b/res/layout/draggable_row.xml
index 4d61841e..b90d40b0 100644
--- a/res/layout/draggable_row.xml
+++ b/res/layout/draggable_row.xml
@@ -23,7 +23,6 @@ along with this program. If not, see .
 	>
 
 	
@@ -32,29 +31,26 @@ along with this program. If not, see .
 			android:id="@+id/pmark"
 			android:visibility="gone"
 			android:layout_width="4dip"
-			android:layout_height="44sp"
+			android:layout_height="@dimen/row_normal_height"
 			android:background="@color/now_playing_marker" />
 
 		
-
+			android:scaleType="centerCrop"
+			android:layout_width="@dimen/cover_size"
+			android:layout_height="@dimen/cover_size"
+			android:layout_marginLeft="@dimen/cover_padding"
+			android:layout_gravity="center_vertical"
+			android:visibility="gone" />
 		
+			android:layout_height="@dimen/row_normal_height"
+			android:layout_marginLeft="@dimen/text_padding"
+			android:layout_weight="1" />
 
 		.
 			android:checkMark="?android:attr/listChoiceIndicatorMultiple"
 			android:gravity="center_vertical"
 			android:layout_height="match_parent"
-			android:layout_width="44sp"/>
+			android:layout_width="@dimen/row_normal_height"/>
 
 		
+			android:scaleType="center"
+			android:layout_width="@dimen/row_normal_height"
+			android:layout_height="@dimen/row_normal_height"
+	/>
 	
 
 	
+		android:layout_height="1dip"
+		android:background="?android:attr/dividerHorizontal"/>
 
 
diff --git a/res/layout/filebrowser_content.xml b/res/layout/filebrowser_content.xml
index a5bb9db3..114ac0c1 100644
--- a/res/layout/filebrowser_content.xml
+++ b/res/layout/filebrowser_content.xml
@@ -35,6 +35,7 @@ THE SOFTWARE.
 		android:layout_height="wrap_content"
 		android:layout_width="0dp"
 		android:layout_weight="2"
+		android:layout_marginLeft="@dimen/text_padding"
 		android:text="" />