-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[RingtonePicker] Get cursor to list parent sounds
Since it is now possible for the work profile to use ringtones from the personal profile, even custom ringtones, then it makes sense for the RingtonePicker to list them as well. This changes use a new RingtoneManager API to also include the personal ringtones in the work profile RingtonePicker, also displaying a small work badge next to the custom ringtones of the work profile. Test: manual - install custom ringtone in work profile and see if it shows with a work badge in the picker Bug: 30658854 Change-Id: I76e46e7d9401d54e8f096b80ea79e643ce2ab37e
- Loading branch information
Showing
3 changed files
with
211 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<!-- Copyright (C) 2016 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. | ||
--> | ||
|
||
<com.android.providers.media.CheckedListItem xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:gravity="center_vertical" | ||
android:background="?android:attr/selectableItemBackground" | ||
> | ||
|
||
<CheckedTextView | ||
android:id="@+id/checked_text_view" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:minHeight="?android:attr/listPreferredItemHeightSmall" | ||
android:textAppearance="?android:attr/textAppearanceMedium" | ||
android:textColor="?android:attr/textColorAlertDialogListItem" | ||
android:gravity="center_vertical" | ||
android:paddingStart="20dp" | ||
android:paddingEnd="?android:attr/dialogPreferredPadding" | ||
android:drawableStart="?android:attr/listChoiceIndicatorSingle" | ||
android:drawablePadding="20dp" | ||
android:ellipsize="marquee" | ||
android:layout_toLeftOf="@+id/work_icon" | ||
android:maxLines="3" /> | ||
|
||
<ImageView | ||
android:id="@id/work_icon" | ||
android:layout_width="18dp" | ||
android:layout_height="18dp" | ||
android:layout_alignParentRight="true" | ||
android:layout_centerVertical="true" | ||
android:scaleType="centerCrop" | ||
android:layout_marginRight="20dp" /> | ||
</com.android.providers.media.CheckedListItem> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/* | ||
* Copyright (C) 2016 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.providers.media; | ||
|
||
import android.content.Context; | ||
import android.widget.Checkable; | ||
import android.widget.CheckedTextView; | ||
import android.widget.RelativeLayout; | ||
import android.util.AttributeSet; | ||
|
||
/** | ||
* The {@link CheckedListItem} is a layout item that represents a ringtone, and is used in | ||
* {@link RingtonePickerActivity}. It contains the ringtone's name, and a work badge to right of the | ||
* name if the ringtone belongs to a work profile. | ||
*/ | ||
public class CheckedListItem extends RelativeLayout implements Checkable { | ||
|
||
public CheckedListItem(Context context) { | ||
super(context); | ||
} | ||
|
||
public CheckedListItem(Context context, AttributeSet attrs) { | ||
super(context, attrs); | ||
} | ||
|
||
public CheckedListItem(Context context, AttributeSet attrs, int defStyleAttr) { | ||
super(context, attrs, defStyleAttr); | ||
} | ||
|
||
public CheckedListItem(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { | ||
super(context, attrs, defStyleAttr, defStyleRes); | ||
} | ||
|
||
@Override | ||
public void setChecked(boolean checked) { | ||
getCheckedTextView().setChecked(checked); | ||
} | ||
|
||
@Override | ||
public boolean isChecked() { | ||
return getCheckedTextView().isChecked(); | ||
} | ||
|
||
@Override | ||
public void toggle() { | ||
getCheckedTextView().toggle(); | ||
} | ||
|
||
private CheckedTextView getCheckedTextView() { | ||
return (CheckedTextView) findViewById(R.id.checked_text_view); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters