Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 816cf52a: Fix the DEFAULT_SORT_ORDER value for media files. Changing this is OK, because existing app will have the old value compiled in as a literal, and so will continue to (not) work in the same way as before. Add code to media key generator to give a leading a

Browse Source 
Merge commit '816cf52abd8f45770f0ac922bbb819184ed4b90f'

* commit '816cf52abd8f45770f0ac922bbb819184ed4b90f':
  Fix the DEFAULT_SORT_ORDER value for media files. Changing this
This commit is contained in:
Marco Nelissen
2009-07-06 11:54:24 -07:00
committed by The Android Open Source Project
parent c8f800edb2 816cf52abd
commit ff7d0e2bcc
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/4.xml
View File

@@ -88821,7 +88821,7 @@
type="java.lang.String"
transient="false"
volatile="false"
value=""title""
value=""title_key""
static="true"
final="true"
deprecated="not deprecated"
@@ -88918,7 +88918,7 @@
type="java.lang.String"
transient="false"
volatile="false"
value=""title""
value=""title_key""
static="true"
final="true"
deprecated="not deprecated"

4
api/current.xml
View File

@@ -108264,7 +108264,7 @@
type="java.lang.String"
transient="false"
volatile="false"
value=""title""
value=""title_key""
static="true"
final="true"
deprecated="not deprecated"
@@ -108361,7 +108361,7 @@
type="java.lang.String"
transient="false"
volatile="false"
value=""title""
value=""title_key""
static="true"
final="true"
deprecated="not deprecated"

16
core/java/android/provider/MediaStore.java
View File

@@ -722,9 +722,15 @@ public final class MediaStore
*/
public static String keyFor(String name) {
if (name != null) {
boolean sortfirst = false;
if (name.equals(android.media.MediaFile.UNKNOWN_STRING)) {
return "\001";
}
// Check if the first character is \001. We use this to
// force sorting of certain special files, like the silent ringtone.
if (name.startsWith("\001")) {
sortfirst = true;
}
name = name.trim().toLowerCase();
if (name.startsWith("the ")) {
name = name.substring(4);
@@ -753,7 +759,11 @@ public final class MediaStore
b.append('.');
}
name = b.toString();
return DatabaseUtils.getCollationKey(name);
String key = DatabaseUtils.getCollationKey(name);
if (sortfirst) {
key = "\001" + key;
}
return key;
} else {
return "";
}
@@ -800,7 +810,7 @@ public final class MediaStore
/**
* The default sort order for this table
*/
public static final String DEFAULT_SORT_ORDER = TITLE;
public static final String DEFAULT_SORT_ORDER = TITLE_KEY;
/**
* Activity Action: Start SoundRecorder application.
@@ -897,7 +907,7 @@ public final class MediaStore
/**
* The default sort order for this table
*/
public static final String DEFAULT_SORT_ORDER = TITLE;
public static final String DEFAULT_SORT_ORDER = TITLE_KEY;
/**
* The ID of the audio file