drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,811 Commits 1 Branch 0 Tags
Commit Graph

94811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
bff5ca576e audio service: set dock use on mediaserver restart 
Restore forced usage of dock audio for media according to
current setting when media server restarts.

Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
 2012-11-02 16:48:26 -07:00
Baligh Uddin
fb218285b9 am 3cdcd8f5: (-s ours) am 19e98ea1: am 37238e5a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '3cdcd8f514afe9cca6fd166884797841c4c87b36':
  Import translations. DO NOT MERGE
 2012-11-02 09:16:37 -07:00
Baligh Uddin
3cdcd8f514 am 19e98ea1: am 37238e5a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '19e98ea120472b5e13c1644b840e13cb12c18d09':
  Import translations. DO NOT MERGE
 2012-11-02 09:14:34 -07:00
Baligh Uddin
19e98ea120 am 37238e5a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '37238e5a4e10c5c5439f6864dd19049a5544e01a':
  Import translations. DO NOT MERGE
 2012-11-02 09:12:12 -07:00
Baligh Uddin
37238e5a4e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-02 09:08:57 -07:00
Baligh Uddin
feb4ba4199 Merge "Import translations. DO NOT MERGE" 2012-11-02 08:14:58 -07:00
Baligh Uddin
c624f9fd0b am 582c4058: (-s ours) am 48a9c6e4: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '582c40584801edbe72ec331b54db37040a4469fb':
  Import translations. DO NOT MERGE
 2012-11-02 08:09:06 -07:00
Baligh Uddin
582c405848 am 48a9c6e4: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '48a9c6e47ffcbabcbc263fedeb4f9219d2af8c1b':
  Import translations. DO NOT MERGE
 2012-11-02 08:06:55 -07:00
Baligh Uddin
48a9c6e47f Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-02 08:03:08 -07:00
The Android Open Source Project
b3d71b473e am 2c8e8425: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '2c8e842565cbd440208e458b89ab2583c17fe979':
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
 2012-11-02 07:30:37 -07:00
The Android Open Source Project
2c8e842565 Reconcile with jb-mr1-release - do not merge 
Change-Id: Id1f72e48cffb14e221a741bc6975cd5b859892f7
 2012-11-02 07:28:18 -07:00
Baligh Uddin
02a0fbc37d Import translations. DO NOT MERGE 
Change-Id: I9eae80909f780e5ab7e6797514809fec8428659e
Auto-generated-cl: translation import
 2012-11-02 00:16:51 -07:00
Baligh Uddin
d7ad778914 Import translations. DO NOT MERGE 
Change-Id: I663c9a6379eb664e31cdb5984c55cf70a6c99999
Auto-generated-cl: translation import
 2012-11-02 00:14:48 -07:00
Baligh Uddin
476049e4db Import translations. DO NOT MERGE 
Change-Id: I1315a8bf6e0de07d5f93aa2a20dfc1431e5829d8
Auto-generated-cl: translation import
 2012-11-02 00:14:02 -07:00
Winson Chung
a76c343eca am be351bb2: am 2c77a1d8: am 98b930ce: Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991) 
* commit 'be351bb29a4b6463671e96f96e64b5aeea1d1222':
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
 2012-11-01 23:43:37 -07:00
Winson Chung
90d0db346a Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991) 
Change-Id: I28ebbd04d90a1ea2a721c28d3bce7ccea31a33e9
 2012-11-01 23:43:30 -07:00
Winson Chung
be351bb29a am 2c77a1d8: am 98b930ce: Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991) 
* commit '2c77a1d8d7024ceef78f7aa27bc09fa7c0189dfd':
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
 2012-11-01 23:41:51 -07:00
Winson Chung
2c77a1d8d7 am 98b930ce: Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991) 
* commit '98b930ce4ca4258fe1d6e9df0053f6883517a241':
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
 2012-11-01 23:39:11 -07:00
Winson Chung
98b930ce4c Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991) 
Change-Id: I28ebbd04d90a1ea2a721c28d3bce7ccea31a33e9
 2012-11-01 23:34:47 -07:00
Ed Heyl
7b16d9b18c am fc3d4dbd: am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev 
* commit 'fc3d4dbd091ad91307bbba63892f2cee42f97f5f':
  Keyguard sliding challenge - fix overeager touch interception
  Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
  Showing message when max attempts are hit in face unlock fixes b/7306168
  Keyguard tablet/portrait fix for HUGE security views
  Cancel camera launch on screen off.
  Fix launcher flash during secure camera transition.
  Updating isShowing during onResume()
  Suppressing FUL after going to backup fixes b/7449820
  Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
  Adding a button for expanding the clock screen challenge.
  Accessibility support for the lockscreen  - phone.
  Stripping dead API related to keyguard widgets
  FUL being unsuppressed when screen turns off fixes b/7453702
  Show the keyboard less aggressively.
 2012-11-01 19:18:16 -07:00
Ed Heyl
fc3d4dbd09 am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev 
* commit '6ae7e75876bbdf7d11e1c78d784f0eeb346e7215':
  Keyguard sliding challenge - fix overeager touch interception
  Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
  Showing message when max attempts are hit in face unlock fixes b/7306168
  Keyguard tablet/portrait fix for HUGE security views
  Cancel camera launch on screen off.
  Fix launcher flash during secure camera transition.
  Updating isShowing during onResume()
  Suppressing FUL after going to backup fixes b/7449820
  Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
  Adding a button for expanding the clock screen challenge.
  Accessibility support for the lockscreen  - phone.
  Stripping dead API related to keyguard widgets
  FUL being unsuppressed when screen turns off fixes b/7453702
  Show the keyboard less aggressively.
 2012-11-01 19:15:46 -07:00
Ed Heyl
6ae7e75876 am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev 
* commit '39912f7fcd5bfc4943bac1746c3ff2a9f1d93043':
  Keyguard sliding challenge - fix overeager touch interception
  Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
  Showing message when max attempts are hit in face unlock fixes b/7306168
  Keyguard tablet/portrait fix for HUGE security views
  Cancel camera launch on screen off.
  Fix launcher flash during secure camera transition.
  Updating isShowing during onResume()
  Suppressing FUL after going to backup fixes b/7449820
  Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
  Adding a button for expanding the clock screen challenge.
  Accessibility support for the lockscreen  - phone.
  Stripping dead API related to keyguard widgets
  FUL being unsuppressed when screen turns off fixes b/7453702
  Show the keyboard less aggressively.
 2012-11-01 19:13:04 -07:00
The Android Automerger
4b22662d95 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-01 19:05:25 -07:00
Ed Heyl
39912f7fcd Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev 2012-11-01 18:06:35 -07:00
Marco Nelissen
dd1caa0050 Merge "Remove special case in media scanner" 2012-11-01 16:20:24 -07:00
Marco Nelissen
da8fe0faf5 Remove special case in media scanner 
The media provider now takes care of case-sensitivity, so there is
no special handling needed when looking up entries in the database.

Change-Id: I2a23c4f1875a8ffea140281572b1e2c90cce60a7
 2012-11-01 16:04:32 -07:00
Jeff Brown
a14fb9c273 am 2c996b4b: am 676adb58: am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev 
* commit '2c996b4b791e5f18e2c6518e8f27d3bc43aa9bc2':
  Eliminate potential reentrance from unregisterInputChannel.
 2012-11-01 15:50:17 -07:00
Jeff Brown
2c996b4b79 am 676adb58: am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev 
* commit '676adb589103e452f7d441c04b3386f30062b919':
  Eliminate potential reentrance from unregisterInputChannel.
 2012-11-01 15:47:55 -07:00
Jeff Brown
676adb5891 am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev 
* commit '62831a7bd02868316ad1a16dcf13c98896fdbbdc':
  Eliminate potential reentrance from unregisterInputChannel.
 2012-11-01 15:45:50 -07:00
Scott Main
b274ea641b am 5384dc65: am 7b076cee: am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit '5384dc65b7fc64341afa42114086368222c0a972':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:44:31 -07:00
Jeff Brown
62831a7bd0 Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev 2012-11-01 15:42:33 -07:00
Scott Main
5384dc65b7 am 7b076cee: am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit '7b076ceec4d62aa8d65696f368f16cbf5dbf60e0':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:42:11 -07:00
Scott Main
7b076ceec4 am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit '30fd78e27294cd7104f6589ab10f3f3dd1e65fcc':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:40:03 -07:00
Scott Main
30fd78e272 am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit 'a47776c9f889242b3bcff0ff2d113d50da342262':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:37:31 -07:00
Victoria Lease
0021f7badb Merge "Revert "Update the location tracker test app"" 2012-11-01 15:36:34 -07:00
Scott Main
a47776c9f8 am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit '2cff3eeaeb419fcdfc7307c2c52a653483c76ddb':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:34:42 -07:00
Laurent Tu
870d738ad7 am 6ad873d4: am e730010e: am 7ab7f538: Hide new location APIs and undeprecate old ones 
* commit '6ad873d4a642f823addf519ba252f188424431fa':
  Hide new location APIs and undeprecate old ones
 2012-11-01 15:33:20 -07:00
Scott Main
2cff3eeaeb am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 
* commit 'f19804b5e994d183e6f6eeb512f74f2380ffd533':
  new dashboard stats for 11/1, platform version only
 2012-11-01 15:31:53 -07:00
Laurent Tu
6ad873d4a6 am e730010e: am 7ab7f538: Hide new location APIs and undeprecate old ones 
* commit 'e730010edc460384298a2833d82c5e4dc1e75756':
  Hide new location APIs and undeprecate old ones
 2012-11-01 15:30:08 -07:00
Scott Main
f19804b5e9 Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs 2012-11-01 15:28:34 -07:00
Laurent Tu
e730010edc am 7ab7f538: Hide new location APIs and undeprecate old ones 
* commit '7ab7f538924371a9dd4be7a27a6ae3b4c04b301c':
  Hide new location APIs and undeprecate old ones
 2012-11-01 15:28:08 -07:00
Scott Main
500d05e573 am 02acfc79: am 6a66cfce: am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev 
* commit '02acfc79c18bf5bbe5e6456d8767c53a3b8de6eb':
  docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
 2012-11-01 15:23:58 -07:00
Laurent Tu
7ab7f53892 Hide new location APIs and undeprecate old ones 
Hide all new location APIs related to LocationRequest/Geofence and
undeprecate all deprecated APIs consequently to the LocationRequest and
Geofence introduction. Also introduce LocationRequestUnbundled for
LocationProviders to use.

Change-Id: I5b116c7d342041f45b341c88a4b6813571118018
 2012-11-01 15:22:22 -07:00
Dianne Hackborn
203a59866a am 8b91e6ba: am f1db87cb: am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev 
* commit '8b91e6bab8ac21bba17efd0cad3a512790132846':
  More debugging for issue #7343200 Fails to show wallpaper in the...
 2012-11-01 15:21:10 -07:00
Scott Main
02acfc79c1 am 6a66cfce: am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev 
* commit '6a66cfce8bd564664ea77d9204df91e98af2a2f1':
  docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
 2012-11-01 15:20:47 -07:00
Victoria Lease
e74c546551 am 1b414c7e: am 07fcfef2: am 1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev 
* commit '1b414c7e8c64048b46f358a5fb0b43c138f8204c':
  fix NLP for COARSE applications, build FLP with SDK
 2012-11-01 15:19:13 -07:00
Svetoslav Ganov
cf8384abfc am 49c2756b: am b3ec0639: am 7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev 
* commit '49c2756b1c4996e9ebcc70c89095f436790b5469':
  Fix accessibility API injection.
 2012-11-01 15:19:06 -07:00
Dianne Hackborn
8b91e6bab8 am f1db87cb: am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev 
* commit 'f1db87cb163049698e6f336fbf1447714c966443':
  More debugging for issue #7343200 Fails to show wallpaper in the...
 2012-11-01 15:17:49 -07:00
Scott Main
6a66cfce8b am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev 
* commit '465c37533ac1fb76d76b062452ae19afb84aab0a':
  docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
 2012-11-01 15:17:44 -07:00
Dianne Hackborn
f1db87cb16 am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev 
* commit 'b9372de07d3329928f28104bb997aab57237504c':
  More debugging for issue #7343200 Fails to show wallpaper in the...
 2012-11-01 15:15:56 -07:00