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

Unverified Commit cb798c3f authored by Raman Tenneti's avatar Raman Tenneti Committed by Michael Bestas
Browse files

AOSP/Gallery2 - Update language to comply with Android's inclusive language guidance. 

See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: Manual.

$ ls -l out/target/product/bonito/product/app/Gallery2/Gallery2.apk
  -rw-r----- 1 rtenneti primarygroup 7429083 Jul 28 21:40 out/target/product/bonito/product/app/Gallery2/Gallery2.apk

$ adb install -r out/target/product/bonito/product/app/Gallery2/Gallery2.apk

Change-Id: Ife78a86551991069f203ec138f46b222973519cc
parent 8006e983

gallerycommon/src/com/android/gallery3d/common/BlobCache.java

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ public class BlobCache implements Closeable { 
                return false;

            }



            // Sanity check

            // Initial check

            if (mMaxEntries <= 0) {

                Log.w(TAG, "invalid max entries");

                return false;

res/values/filtershow_strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ 
    <string name="editor_grad_contrast">Contrast</string>

    <!--  Label for the saturation effect  [CHAR LIMIT=20] -->

    <string name="editor_grad_saturation">Saturation</string>

    <!--  Label for the Main or Master control for per channel saturation effect [CHAR LIMIT=20] -->

    <!--  Label for the Main or Primary control for per channel saturation effect [CHAR LIMIT=20] -->

    <string name="editor_chan_sat_main">Main</string>

    <!--  Label for the red control for per channel saturation effect [CHAR LIMIT=20] -->

    <string name="editor_chan_sat_red">Red</string>

src/com/android/gallery3d/app/PhotoPage.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ import com.android.gallery3d.data.SnailAlbum; 
import com.android.gallery3d.data.SnailItem;

import com.android.gallery3d.data.SnailSource;

import com.android.gallery3d.filtershow.FilterShowActivity;

import com.android.gallery3d.filtershow.imageshow.MasterImage;

import com.android.gallery3d.filtershow.imageshow.PrimaryImage;

import com.android.gallery3d.filtershow.tools.DualCameraEffect;

import com.android.gallery3d.ui.DetailsHelper;

import com.android.gallery3d.ui.DetailsHelper.CloseListener;

src/com/android/gallery3d/filtershow/EditorPlaceHolder.java

+16 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.

 */



package com.android.gallery3d.filtershow;



import android.view.View;

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+104 −102

File changed.

Preview size limit exceeded, changes collapsed.