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

68229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
d9fe8018ff Move the automatic namespace outside of the res namespace. 
Change-Id: I107ee94af0a13f008ef4a8844a9038b84f97a247
 2012-02-23 16:59:27 -08:00
Alex Sakhartchouk
5d3bc7d3e4 Merge "Adding a few more howto elements to scenegraph example." 2012-02-23 16:57:00 -08:00
Dianne Hackborn
e639da7baa New development permissions. 
These are permissions that an application can request, but won't
normally be granted.  To have the permission granted, the user
must explicitly do so through a new "adb shell pm grant" command.

I put these permissions in the "development tools" permission
group.  Looking at the stuff there, I think all of the permissions
we already had in that group should be turned to development
permissions; I don't think any of them are protecting public APIs,
and they are really not things normal applications should use.

The support this, the protectionLevel of a permission has been
modified to consist of a base protection type with additional
flags.  The signatureOrSystem permission has thus been converted
to a signature base type with a new "system" flag; you can use
"system" and/or "dangerous" flags with signature permissions as
desired.

The permissions UI has been updated to understand these new types
of permissions and know when to display them.  Along with doing
that, it also now shows you which permissions are new when updating
an existing application.

This also starts laying the ground-work for "optional" permissions
(which development permissions are a certain specialized form of).
Completing that work requires some more features in the package
manager to understand generic optional permissions (having a
facility to not apply them when installing), along with the
appropriate UI for the app and user to manage those permissions.

Change-Id: I6571785c6bb5f6b291862b7a9be584885f88f3a5
 2012-02-23 16:39:15 -08:00
Andrew Flynn
ec63cd85c8 Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop 2012-02-23 16:09:36 -08:00
Andrew Flynn
a227a12314 DO NOT MERGE Return 1.5 * density as default for large screens. 
Change-Id: Ib2d390803f08812636364ceb3849eddf80044072
 2012-02-23 15:46:08 -08:00
George Mount
9a6077e22e Disable selection when nothing selected. 
Bug 6059606

Change-Id: I2c9acaa601e38a2cd0eec516709aa63f31ce0e29
 2012-02-23 15:23:35 -08:00
George Mount
583e885bef Merge "Add javascript key events for special characters." 2012-02-23 14:43:02 -08:00
Joe Fernandez
a83a6b3ce8 am fad35e3b: am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 
* commit 'fad35e3b9190c25700c62cc1c4b3d369f5d42a60':
  docs: NDK overview, remove x86 instruction set mention (b/6044027)
 2012-02-23 14:31:38 -08:00
Joe Fernandez
fad35e3b91 am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 
* commit '53c0d46d85a651093382a92466b0b0658ef1920c':
  docs: NDK overview, remove x86 instruction set mention (b/6044027)
 2012-02-23 14:28:07 -08:00
Joe Fernandez
53c0d46d85 am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
  docs: NDK overview, remove x86 instruction set mention (b/6044027)
 2012-02-23 14:25:01 -08:00
Joe Fernandez
c6e3f6f1a7 am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
  docs: NDK overview, remove x86 instruction set mention (b/6044027)
 2012-02-23 14:24:53 -08:00
Joe Fernandez
566328a2a5 Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 2012-02-23 14:22:41 -08:00
Jason Sams
a23c4ebe04 Merge "start new headers" 2012-02-23 14:19:43 -08:00
James Dong
b8c247bde9 Merge "Fix memory leakage due to unreleased MuxOMX objects after disconnection" 2012-02-23 14:17:39 -08:00
James Dong
ca88e35764 Fix memory leakage due to unreleased MuxOMX objects after disconnection 
o related-to-bug: 5984232

Change-Id: I20cbeff6ae865e995d02342549f1e09320543740
 2012-02-23 14:04:20 -08:00
Romain Guy
1ea55cf3c7 Merge "Perform early intersect to avoid unnecessary draws" 2012-02-23 13:53:47 -08:00
Romain Guy
cfef12374c Perform early intersect to avoid unnecessary draws 
Change-Id: I48d61c4488e622f93733d8e53a50c93e6a20166d
 2012-02-23 13:50:37 -08:00
John Reck
1aa939759c Merge "Support mIntentUrl for addresses" 2012-02-23 13:40:25 -08:00
Eric Fischer
b442eca2b1 Merge "Import translations. DO NOT MERGE" 2012-02-23 13:17:10 -08:00
Eric Fischer
6c89da2963 Import translations. DO NOT MERGE 
Change-Id: I49ba9b62c775d42d0f785a54d7c575bd93380a85
 2012-02-23 13:14:21 -08:00
Jean-Baptiste Queru
111a7a107c am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '0842a2262d03fc98e42541cb38f51a341d346ae0':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 13:04:24 -08:00
Jean-Baptiste Queru
0842a2262d am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit 'fe99051c78994e0cc5153468eeba6f75f3e04b8e':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 13:01:59 -08:00
Jean-Baptiste Queru
fe99051c78 am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 12:59:22 -08:00
Jean-Baptiste Queru
0e25e4cd29 am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 12:57:03 -08:00
Jean-Baptiste Queru
63e43ba56a Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 2012-02-23 12:38:14 -08:00
Michael Jurka
61fd70a34f am 08cb8352: am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen 
* commit '08cb8352ef208730e4e3e1e71ebc47a59f0363de':
 2012-02-23 12:26:18 -08:00
Michael Jurka
b7ee8e2cb4 am 6ad5d69d: am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen 
* commit '6ad5d69da5cff2e4b5fb7acdb2699e2315b83307':
  Don't allow screen invalidations to go outside bounds of screen
 2012-02-23 12:26:16 -08:00
Scott Main
6bf8742ff9 am 8857f669: am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1 
* commit '8857f669f902acd5f3763ea65b023a0987e6ea0e':
 2012-02-23 12:26:01 -08:00
Scott Main
3fcf93b037 am cb4ebcb2: am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1 
* commit 'cb4ebcb20b8540cc8027ae03dd578ce3846e9af1':
  docs: fix broken link
 2012-02-23 12:25:53 -08:00
Xavier Ducrohet
68466c5220 am 3c84c30a: am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit '3c84c30a8605b56d63847081eaba79562dc1fa83':
 2012-02-23 12:25:46 -08:00
Jean-Baptiste Queru
9f0094d7df am 9379ac38: (-s ours) am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility" 
* commit '9379ac3878f8ef104eb540566048d56577004190':
  Add stubs for improved compatibility
 2012-02-23 12:25:44 -08:00
Xavier Ducrohet
5e6c219477 am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit 'f8e737cb61ab86b90ec318591fbcfec40fac63cf':
  Make sure resource references are resolved.
 2012-02-23 12:22:40 -08:00
Jean-Baptiste Queru
6822c97898 am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin" 
* commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5':
  Xcode 4.3 compatibility checkin
 2012-02-23 12:22:35 -08:00
Jean-Baptiste Queru
afb902be67 am 9f207a85: (-s ours) am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem" 
* commit '9f207a850f6c5744db895692f21159d9a88966c5':
  The bigger touch slop still has a problem
 2012-02-23 12:22:29 -08:00
Andreas Huber
b07ae06e75 Merge "Be more greedy when it comes to gathering input and output buffers." 2012-02-23 11:54:08 -08:00
Adam Powell
6723dd9561 Merge "Bug 6058721 - optimize changing checked states in AbsListView" 2012-02-23 11:49:05 -08:00
Andreas Huber
a2798e252a Be more greedy when it comes to gathering input and output buffers. 
Change-Id: I54c4f608e5155917ca35eba5655b4c06357fb112
 2012-02-23 11:21:43 -08:00
Rich Hyndman
d2b44e0706 am 46074f4d: am 3ebde8a2: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 
* commit '46074f4d4aa8334249a9bd71e6d0bc25066d5cae':
 2012-02-23 11:20:43 -08:00
Rich Hyndman
0b2a139142 am f2381328: am 22c98df9: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 
* commit 'f238132853d2482979ec98a9d4f81ea24273768d':
  docs: Added Lint into Android Training and removed Layoutopt.
 2012-02-23 11:20:40 -08:00
The Android Open Source Project
1e5a331be6 am d4c617ae: am 41cea4b5: Reconcile with ics-mr1-release 
* commit 'd4c617aed18ba4080c773ff40a2b0f75b4a73645':
 2012-02-23 11:20:36 -08:00
The Android Open Source Project
77252c664c am f815dc4e: am 64a907c5: Reconcile with ics-mr1-release 
* commit 'f815dc4e4a09ec53f183a391495ef87dd21ccc6f':
 2012-02-23 11:20:30 -08:00
The Android Open Source Project
9d3864c942 am c6a1c584: am 6815d49c: Reconcile with ics-mr1-release 
* commit 'c6a1c58452bc9207cc7dba8ad40ad0535fb356bb':
 2012-02-23 11:20:16 -08:00
The Android Open Source Project
4c569c5f89 am 5cfee77e: am 8013fd39: Reconcile with ics-mr1-release 
* commit '5cfee77e400a6e1f51b37e03ce090bc233f1bb8a':
 2012-02-23 11:19:58 -08:00
Dianne Hackborn
a2514f3a95 am 536a3b18: am f08beab2: am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit '536a3b185bb0a2f7bc11b78e00123ee502c99f2f':
 2012-02-23 11:19:50 -08:00
Adam Powell
29382d9d9d Bug 6058721 - optimize changing checked states in AbsListView 
Instead of treating a checked state change as a full data set change,
simply modify the checked or activated state of on-screen views.
Any resulting layout changes will be serviced as appropriate.

Change-Id: Ia846de16bbc54f0729608259aa4b530da9404245
 2012-02-23 11:04:38 -08:00
James Dong
365ce1db33 Improved comment about DrmStore.ConstraintsColumns 
Change-Id: I89c588759dd409ac0252d686af12bfe4e105f3d5
 2012-02-23 10:58:55 -08:00
Dianne Hackborn
b8678d76c3 resolved conflicts for merge of 210c1a26 to master 
Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8
 2012-02-23 10:54:06 -08:00
The Android Automerger
b585b9f400 merge in ics-mr1-release history after reset to ics-mr1 2012-02-23 10:45:15 -08:00
Dianne Hackborn
c42067d7d7 Merge "Fix issue #6049410: 3rd party app crashing in JB: Uber" 2012-02-23 10:45:11 -08:00
John Reck
4d0a8cf067 Support mIntentUrl for addresses 
Change-Id: I61abf7f333608fa91629ce62e348dda83a795e45
 2012-02-23 10:28:53 -08:00