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

Commit 8227ac66 authored by Bobby Georgescu's avatar Bobby Georgescu Committed by Android (Google) Code Review
Browse files

Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce

parents c6a1167e 55953517

res/drawable/white_text_bg_gradient.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?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.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <gradient

        android:startColor="#DD000000"

        android:endColor="#00FFFFFF"

        android:angle="90"

     />

</shape>
 
 No newline at end of file

res/layout/album_content.xml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
<?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.

-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    <LinearLayout android:id="@+id/progressContainer"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone"

            android:gravity="center">



        <ProgressBar style="?android:attr/progressBarStyleLarge"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

        <TextView android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:text="@string/loading"

                android:paddingTop="4dip"

                android:singleLine="true" />



    </LinearLayout>



    <FrameLayout android:id="@+id/gridContainer"

            android:layout_width="match_parent"

            android:layout_height="match_parent">



        <com.android.photos.views.HeaderGridView android:id="@android:id/list"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:choiceMode="multipleChoiceModal"

                android:numColumns="auto_fit"

                android:stretchMode="columnWidth"

                android:drawSelectorOnTop="true" />

        <TextView android:id="@android:id/empty"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:gravity="center"

                android:textAppearance="?android:attr/textAppearanceMedium" />

    </FrameLayout>



</FrameLayout>
 
 No newline at end of file

res/layout/album_header.xml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
<?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.

-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content" >



    <ImageView

        android:id="@+id/album_header_image"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:scaleType="centerCrop" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_alignParentLeft="true"

        android:paddingLeft="15dip"

        android:paddingBottom="10dip"

        android:paddingTop="20dip"

        android:background="@drawable/white_text_bg_gradient"

        android:layout_gravity="bottom"

        android:orientation="vertical" >



        <TextView

            android:id="@+id/album_header_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@android:color/white"

            android:textAppearance="?android:attr/textAppearanceLarge" />



        <TextView

            android:id="@+id/album_header_subtitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@android:color/white"

            android:textAppearance="?android:attr/textAppearanceSmall" />



    </LinearLayout>



</FrameLayout>
 
 No newline at end of file

res/layout/multigrid_content.xml

+13 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 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.

*/

<!-- 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.

-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

src/com/android/photos/AlbumActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.os.Bundle; 
public class AlbumActivity extends Activity implements MultiChoiceManager.Provider {



    public static final String KEY_ALBUM_URI = AlbumFragment.KEY_ALBUM_URI;

    public static final String KEY_ALBUM_TITLE = "AlbumTitle";

    public static final String KEY_ALBUM_TITLE = AlbumFragment.KEY_ALBUM_TITLE;



    private MultiChoiceManager mMultiChoiceManager;