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

Commit 43344a91 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "AF: Show passwords settings for available autofill service." into sc-dev am: 1d1f3ea8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13723064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb4fbf73b3057fb59172c28977235578cb0864d5
parents b876f4f4 1d1f3ea8

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -11543,8 +11543,10 @@ 
    <!-- AutoFill strings -->

    <!-- Preference label for choosing auto-fill service. [CHAR LIMIT=60] -->

    <string name="autofill_app">Autofill service</string>

    <!-- Preference category for showing auto-fill services with saved passwords. [CHAR LIMIT=60] -->

    <string name="autofill_passwords">Passwords</string>

    <!-- Keywords for the auto-fill feature. [CHAR LIMIT=NONE] -->

    <string name="autofill_keywords">auto, fill, autofill</string>

    <string name="autofill_keywords">auto, fill, autofill, password</string>









    <!-- Message of the warning dialog for setting the auto-fill app. [CHAR_LIMIT=NONE] -->









    <string name="autofill_confirmation_message">

























res/xml/default_autofill_picker_settings.xml



+21
−8






























Original line number
Diff line number
Diff line







@@ -22,6 +22,18 @@







    android:title="@string/autofill_app"









    settings:keywords="@string/autofill_keywords">



















  <PreferenceCategory









      android:key="passwords_category"









      android:persistent="false"









      android:title="@string/autofill_passwords"









      settings:controller="com.android.settings.applications.autofill.PasswordsPreferenceController" >









  </PreferenceCategory>



















  <PreferenceCategory









      android:key="default_service_category"









      android:title="@string/autofill_app">



















    <!-- TODO(b/169455298): Fix the redundant title. -->









    <com.android.settings.widget.GearPreference









        android:key="default_autofill_main"









        android:title="@string/autofill_app"








@@ -30,6 +42,7 @@







        settings:keywords="@string/autofill_keywords">









      <extra android:name="for_work" android:value="false" />









    </com.android.settings.widget.GearPreference>









  </PreferenceCategory>





























  <com.android.settings.widget.WorkOnlyCategory
































src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
0 → 100644



+94
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2021 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.settings.applications.autofill;



















import android.annotation.UserIdInt;









import android.content.Context;









import android.content.Intent;









import android.content.pm.PackageManager;









import android.content.pm.ServiceInfo;









import android.graphics.drawable.Drawable;









import android.os.UserHandle;









import android.service.autofill.AutofillServiceInfo;









import android.text.TextUtils;









import android.util.IconDrawableFactory;



















import androidx.preference.Preference;









import androidx.preference.PreferenceGroup;









import androidx.preference.PreferenceScreen;



















import com.android.settings.Utils;









import com.android.settings.core.BasePreferenceController;



















import java.util.List;



















/**









 * Queries available autofill services and adds preferences for those that declare passwords









 * settings.









 */









public class PasswordsPreferenceController extends BasePreferenceController {



















    private final PackageManager mPm;









    private final IconDrawableFactory mIconFactory;









    private final List<AutofillServiceInfo> mServices;



















    public PasswordsPreferenceController(Context context, String preferenceKey) {









        super(context, preferenceKey);









        mPm = context.getPackageManager();









        mIconFactory = IconDrawableFactory.newInstance(mContext);









        mServices = AutofillServiceInfo.getAvailableServices(mContext, UserHandle.myUserId());









        for (int i = mServices.size() - 1; i >= 0; i--) {









            final String passwordsActivity = mServices.get(i).getPasswordsActivity();









            if (TextUtils.isEmpty(passwordsActivity)) {









                mServices.remove(i);









            }









        }









    }



















    @Override









    public int getAvailabilityStatus() {









        return mServices.isEmpty() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;









    }



















    @Override









    public void displayPreference(PreferenceScreen screen) {









        super.displayPreference(screen);









        final PreferenceGroup group = screen.findPreference(getPreferenceKey());









        // TODO(b/169455298): Show work profile passwords too.









        addPasswordPreferences(screen.getContext(), UserHandle.myUserId(), group);









    }



















    private void addPasswordPreferences(









            Context prefContext, @UserIdInt int user, PreferenceGroup group) {









        for (int i = 0; i < mServices.size(); i++) {









            final AutofillServiceInfo service = mServices.get(i);









            final Preference pref = new Preference(prefContext);









            final ServiceInfo serviceInfo = service.getServiceInfo();









            pref.setTitle(serviceInfo.loadLabel(mPm));









            final Drawable icon =









                    mIconFactory.getBadgedIcon(









                            serviceInfo,









                            serviceInfo.applicationInfo,









                            user);









            Utils.setSafeIcon(pref, icon);









            pref.setIntent(









                    new Intent(Intent.ACTION_MAIN)









                            .setClassName(serviceInfo.packageName, service.getPasswordsActivity()));









            group.addPreference(pref);









        }









    }









}