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

90753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
3364b2ff79 Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev 2012-10-04 11:55:28 -07:00
Scott Main
2babbe19a3 am c3b8a9b6: am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev 
* commit 'c3b8a9b6d03283c77d179e1f6293a6319c91e6e6':
  Doc update: TTL change.
 2012-10-04 11:52:41 -07:00
John Spurlock
4e6922d89e Reset status bar in keyguard, fix MU status bar bug. 
Two things going on here, status bar disabled flags need to be reset
on user switch.  Also make status bar's internal disable-record lookup
multi-user aware.

Bug:7278793
Change-Id: I1d7088d956a065330736da4c09cc1874c528c133
 2012-10-04 14:51:51 -04:00
Scott Main
c3b8a9b6d0 am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev 
* commit 'bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a':
  Doc update: TTL change.
 2012-10-04 11:50:18 -07:00
Joe Fernandez
069bc4a3b6 docs: Remove Android Open Accessory docs, which are now on source.android.com 
Change-Id: I5346de7e575304523d33a94329792fb1a37db89b
 2012-10-04 11:43:09 -07:00
Scott Main
bc7a20a48c resolved conflicts for merge of 78866b71 to jb-dev 
Change-Id: I028637f4622f398769ad43e714d45ec95ff3f23d
 2012-10-04 11:39:00 -07:00
Baligh Uddin
73646da5e5 am 5dba4eaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '5dba4eaa547e04a547593e29f406de8394a24b93':
  Import translations. DO NOT MERGE
 2012-10-04 11:31:50 -07:00
Baligh Uddin
56358ffd88 Merge "Import translations. DO NOT MERGE" 2012-10-04 11:30:12 -07:00
Baligh Uddin
5dba4eaa54 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 11:29:39 -07:00
Victoria Lease
51a0daa522 am f9d5a079: am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev 
* commit 'f9d5a079c58a540c307cfe3a2dedb3e8bbd8513d':
  throw SecurityException in isProviderEnabled()
 2012-10-04 11:22:44 -07:00
Victoria Lease
f9d5a079c5 am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev 
* commit '18c2b6e730f6d639421e45328f4fb2514683efe5':
  throw SecurityException in isProviderEnabled()
 2012-10-04 11:20:55 -07:00
Victoria Lease
18c2b6e730 Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev 2012-10-04 11:18:14 -07:00
Baligh Uddin
10819e51e1 am 4b1759d3: (-s ours) am a12f3478: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4b1759d3aa9680224addf706bc3dda4ee47c8e2c':
  Import translations. DO NOT MERGE
 2012-10-04 11:08:39 -07:00
Baligh Uddin
4b1759d3aa am a12f3478: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a12f347895a8686af3b5d18a2cf1ec2017db8124':
  Import translations. DO NOT MERGE
 2012-10-04 11:06:57 -07:00
Baligh Uddin
a12f347895 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 11:05:07 -07:00
Baligh Uddin
c5a4a02997 Merge "Import translations. DO NOT MERGE" 2012-10-04 11:02:16 -07:00
Baligh Uddin
f284dc4081 am dc56aa51: (-s ours) am b34b85a1: am b3f55fde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'dc56aa51cd4041b9df1ecf2be5e449d84fab8f2a':
  Import translations. DO NOT MERGE
 2012-10-04 11:01:50 -07:00
Baligh Uddin
0637cc2db3 am fad961d3: (-s ours) am ed099251: (-s ours) am ceb4a21e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fad961d39db05ab7ad777920371b320f3f35b5ff':
  Import translations. DO NOT MERGE
 2012-10-04 11:01:46 -07:00
Amith Yamasani
7077b3c9bb Read in the disable-keyguard-features flag from the XML file 
Bug: 7283501 Exchange Services crash while using Email App after upgrading
Change-Id: I40d13f5d3805ea3139dc3938077a5265ff78c426
 2012-10-04 11:00:55 -07:00
Baligh Uddin
4ecd2f83f5 Merge "Import translations. DO NOT MERGE" 2012-10-04 11:00:42 -07:00
Baligh Uddin
dc56aa51cd am b34b85a1: am b3f55fde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b34b85a1ef418571365b1b03c25d0d5b4177c1a5':
  Import translations. DO NOT MERGE
 2012-10-04 11:00:07 -07:00
Baligh Uddin
fad961d39d am ed099251: (-s ours) am ceb4a21e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ed099251c9dc6adde28c84c548728ad7bae2ba9b':
  Import translations. DO NOT MERGE
 2012-10-04 11:00:07 -07:00
Baligh Uddin
b34b85a1ef am b3f55fde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b3f55fdef6659b836d97e6859e89a9427b97cc67':
  Import translations. DO NOT MERGE
 2012-10-04 10:58:26 -07:00
Baligh Uddin
ed099251c9 am ceb4a21e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ceb4a21e7257d5e39126f3e5290b2e1448a84532':
  Import translations. DO NOT MERGE
 2012-10-04 10:56:47 -07:00
Baligh Uddin
b3f55fdef6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:55:33 -07:00
Baligh Uddin
ceb4a21e72 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:54:18 -07:00
Scott Main
78866b71e6 Merge "Doc update: TTL change." into jb-dev-docs 2012-10-04 10:20:13 -07:00
Scott Main
dd66e6e3b6 am 33c74402: am f7040ded: am 68e11d40: am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit '33c74402242e515d7169bb72112a92abfca040be':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:17:50 -07:00
Scott Main
33c7440224 am f7040ded: am 68e11d40: am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit 'f7040dedbd61815b99c9597b13df5f999ecf6f41':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:15:45 -07:00
Scott Main
f7040dedbd am 68e11d40: am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit '68e11d40add775fd4ecafb0ca805d83a7f5f9d7d':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:13:34 -07:00
Scott Main
68e11d40ad am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit '70e6cff9bcd464fcb22a0d7dc977863ef0952448':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:12:16 -07:00
Scott Main
70e6cff9bc am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit '6b962174bf974edd5298a37498777780e0b7b1fe':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:10:21 -07:00
Scott Main
6b962174bf am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit 'cea1f19cb85c8204cc920bb1073c0726b610cedd':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:08:00 -07:00
Scott Main
cea1f19cb8 Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 2012-10-04 10:06:02 -07:00
Victoria Lease
83762d22c9 multiuser support for LocationBlacklist 
This allows primary/secondary users to have different "Google
Location Services" preferences. It also reenables LocationBlacklist,
which is fixed elsewhere.

Bug: 7213502
Bug: 7248239
Change-Id: I94837682f95920c225c00b7da2de6dd1418a673e
 2012-10-04 09:46:52 -07:00
James Dong
097922b9c1 Throw an exception instead of crash when a surface does not have a binding surface texture 
o related-to-bug: 7270329

Change-Id: I498d72187968e89d9498d01b10719569e12be2af
 2012-10-04 09:16:40 -07:00
John Spurlock
8fdce01621 am 4ab6d62c: am 220b7d0e: am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev 
* commit '4ab6d62c350c40f25a0471928198050fdd68b62f':
  Clear notifications properly on ACTION_USER_STOPPED.
 2012-10-04 09:14:53 -07:00
John Spurlock
4ab6d62c35 am 220b7d0e: am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev 
* commit '220b7d0ee221b2517189e0fc4c60c77e162b9b36':
  Clear notifications properly on ACTION_USER_STOPPED.
 2012-10-04 09:12:55 -07:00
John Spurlock
220b7d0ee2 am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev 
* commit '1205d16e020beeb16f05e0d788fdf7ed478623f6':
  Clear notifications properly on ACTION_USER_STOPPED.
 2012-10-04 09:11:17 -07:00
John Spurlock
1205d16e02 Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev 2012-10-04 09:09:15 -07:00
John Spurlock
078a490c22 Clear notifications properly on ACTION_USER_STOPPED. 
Which also takes care of the ACTION_USER_REMOVED case.

Bug:7277853
Change-Id: I0a6bade11bd0d420df03e16e69a386cfccfa07cc
 2012-10-04 12:00:53 -04:00
Jeff Hamilton
c19efc204a Changes to support updating location providers. 
There is now only a single config value pointing
at a list of packages to get certs from. The old
system was a bit confusing.

The fused location provider also now builds
against SDK 17, and the meta data service version
tag was renamed from the overly generic "version"
to "serviceVersion".

Bug: 7242814
Change-Id: I00d27c9cbd5cc31a37bb4a98160435d15a72e19e
 2012-10-04 11:00:42 -05:00
Eric Laurent
a92b9536f8 am be535fc8: am d860ab4a: am 31fed737: Merge "AudioService: filter flags in volume methods" into jb-mr1-dev 
* commit 'be535fc86780f58efab4c4fca045a7062af0ce7f':
  AudioService: filter flags in volume methods
 2012-10-04 08:51:11 -07:00
Eric Laurent
be535fc867 am d860ab4a: am 31fed737: Merge "AudioService: filter flags in volume methods" into jb-mr1-dev 
* commit 'd860ab4a22ee6f95238b64e1f4d280bc7b27e665':
  AudioService: filter flags in volume methods
 2012-10-04 08:49:00 -07:00
Eric Laurent
d860ab4a22 am 31fed737: Merge "AudioService: filter flags in volume methods" into jb-mr1-dev 
* commit '31fed73701041cd5455942abe2dacfc7639c5370':
  AudioService: filter flags in volume methods
 2012-10-04 08:46:34 -07:00
Eric Laurent
31fed73701 Merge "AudioService: filter flags in volume methods" into jb-mr1-dev 2012-10-04 08:44:26 -07:00
Victoria Lease
f429921e3a throw SecurityException in isProviderEnabled() 
In MR0, we did not allow applications to query enabled status of
location providers they did not have permission to use. Some
applications counted on this behavior, using the thrown
SecurityException to determine whether or not they have permission
to use the specified provider.

Reverting to this behavior fixes the regressions seen in those
applications.

Bug: 7251459
Change-Id: I8b0cfd5862c80f0c831a4ab544c3fa7408bc84a0
 2012-10-04 08:01:19 -07:00
The Android Open Source Project
23b9f7fc42 am 9fcc8aed: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '9fcc8aed745dec72b560be0a59a68883326283bc':
  Always enable hardware layers in widgets in keyguard while dragging.
  Don't set keyboard insets if keyboard is hidden.
 2012-10-04 07:49:54 -07:00
The Android Open Source Project
9fcc8aed74 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ib34310d4da36e31c2a89ea767a8bb126973bffeb
 2012-10-04 07:48:11 -07:00
The Android Automerger
cd54ca7dc3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 06:59:39 -07:00