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

82700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
7f24ce696a am ccafb1ad: am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev 
* commit 'ccafb1ad5d60d70baa7f4fbf155e906261e42953':
  Introduce multiple displays with DisplayContent.
 2012-08-02 15:08:51 -07:00
Craig Mautner
ccafb1ad5d am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev 
* commit '437a0fbd57662e1d9d260da6f62ff83da2769a7e':
  Introduce multiple displays with DisplayContent.
 2012-08-02 09:22:59 -07:00
Craig Mautner
437a0fbd57 Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev 2012-08-02 09:20:14 -07:00
Craig Mautner
59c009776d Introduce multiple displays with DisplayContent. 
Fix a couple of bugs that turned up.
Remove touch/focus from display. Add iterators for access.
Respond to comments. Remove TODOs, and some deviceId parameters.

Change-Id: Idcdb4f1979aa7b14634d450fd0333d6eff26994d
 2012-08-02 08:47:44 -07:00
Dianne Hackborn
145d27da15 am 23e6a909: am a7ce1551: Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev 
* commit '23e6a9098ad464e1c80614b0f2664f29c075b945':
  Add API to turn on HW drawing in IMEs.
 2012-08-01 19:20:14 -07:00
Dianne Hackborn
23e6a9098a am a7ce1551: Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev 
* commit 'a7ce1551a6c05d4f983e283b413cadb1ddc1026d':
  Add API to turn on HW drawing in IMEs.
 2012-08-01 19:15:23 -07:00
Dianne Hackborn
a7ce1551a6 Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev 2012-08-01 19:05:52 -07:00
Dianne Hackborn
836531b0c4 Add API to turn on HW drawing in IMEs. 
Change-Id: Ib6a8bda46223ce1153f32834daf02a820d16136e
 2012-08-01 19:00:38 -07:00
Jason Sams
e5f2ccd957 am eae05d9d: am 450ec419: Merge "Vignette filter: precompute more values, simplify math, cleanup code" into jb-mr1-dev 
* commit 'eae05d9d24e82ba60cb76944addc4f12ba12168c':
  Vignette filter:  precompute more values, simplify math, cleanup code
 2012-08-01 18:44:35 -07:00
Jason Sams
eae05d9d24 am 450ec419: Merge "Vignette filter: precompute more values, simplify math, cleanup code" into jb-mr1-dev 
* commit '450ec41919af532d6001ce50acc0fea0c7ced281':
  Vignette filter:  precompute more values, simplify math, cleanup code
 2012-08-01 18:41:55 -07:00
Jason Sams
450ec41919 Merge "Vignette filter: precompute more values, simplify math, cleanup code" into jb-mr1-dev 2012-08-01 18:37:36 -07:00
Wink Saville
bbf224403e am 4feae8fc: am 97425536: Merge "Unhide the new location API\'s" into jb-mr1-dev 
* commit '4feae8fc8c9b0327644c7b38d710f15d5a7f0e57':
  Unhide the new location API's
 2012-08-01 17:25:02 -07:00
Adam Powell
0e74ec2472 am c0332353: am 800dd9b9: Merge "Fix drawable handling for ActionBarContainer" into jb-mr1-dev 
* commit 'c03323530776727879fc2461c876c20aa1bfd721':
  Fix drawable handling for ActionBarContainer
 2012-08-01 17:24:56 -07:00
Katie McCormick
ec705ab672 am 3ff0667d: am ec33e341: am 1cfe4b40: am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev 
* commit '3ff0667d2f014b671ae27318a1e43f95daf96426':
  Doc change: 4K -> 4kb
 2012-08-01 17:24:53 -07:00
Katie McCormick
5ce3de6186 am b929c056: am 2184bae4: am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 
* commit 'b929c056e199e1be5087cee775faff0e01d1bed6':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
 2012-08-01 17:24:46 -07:00
Scott Main
cdf3d5e231 am 97592ec3: am c221f35d: am a9a3c25a: am c9506415: Group revert of the following commits for design docs: 
* commit '97592ec3a5c5ee69f2a973239475579366ed8b49':
  Group revert of the following commits for design docs:
 2012-08-01 17:24:39 -07:00
Wink Saville
4feae8fc8c am 97425536: Merge "Unhide the new location API\'s" into jb-mr1-dev 
* commit '9742553603af071b5087df3e352e2ad4ac1d382f':
  Unhide the new location API's
 2012-08-01 16:48:11 -07:00
Wink Saville
9742553603 Merge "Unhide the new location API's" into jb-mr1-dev 2012-08-01 16:43:36 -07:00
Adam Powell
c033235307 am 800dd9b9: Merge "Fix drawable handling for ActionBarContainer" into jb-mr1-dev 
* commit '800dd9b936f75aa09ffc5cb2ed83e351bb00b5d6':
  Fix drawable handling for ActionBarContainer
 2012-08-01 16:41:54 -07:00
Katie McCormick
3ff0667d2f am ec33e341: am 1cfe4b40: am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev 
* commit 'ec33e341f61aafdb1974f4bdd5855740db9fb0e0':
  Doc change: 4K -> 4kb
 2012-08-01 16:41:50 -07:00
Adam Powell
800dd9b936 Merge "Fix drawable handling for ActionBarContainer" into jb-mr1-dev 2012-08-01 16:36:08 -07:00
Katie McCormick
ec33e341f6 am 1cfe4b40: am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev 
* commit '1cfe4b40d3cbf11695ffc70efa891559cff040b7':
  Doc change: 4K -> 4kb
 2012-08-01 16:35:25 -07:00
Adam Powell
a7cc06d82e Fix drawable handling for ActionBarContainer 
ActionBarContainer drawables for primary/stacked/split backgrounds
will now properly respect callbacks, layout direction, etc.

Bug 6905932

Change-Id: I20a089861c66a2a378f4b70c0b6cb4bb27476049
 2012-08-01 16:33:12 -07:00
Katie McCormick
b929c056e1 am 2184bae4: am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 
* commit '2184bae4e58ff5e3c13fbe7493b5dc3d292aaa39':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
 2012-08-01 16:25:56 -07:00
Katie McCormick
1cfe4b40d3 am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev 
* commit '9c311279726598de073314fb6059feea66957219':
  Doc change: 4K -> 4kb
 2012-08-01 16:24:25 -07:00
Katie McCormick
2184bae4e5 am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 
* commit '510d817977af6761274e700178a854b9f9160d9c':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
 2012-08-01 16:22:31 -07:00
Katie McCormick
9c31127972 Merge "Doc change: 4K -> 4kb" into jb-dev 2012-08-01 16:21:53 -07:00
Katie McCormick
510d817977 am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 
* commit 'a5e150c95c6e7c38fc8643c3615f5664e2cd4582':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
 2012-08-01 16:16:22 -07:00
Katie McCormick
a65d0e78dd Doc change: 4K -> 4kb 
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
 2012-08-01 16:14:47 -07:00
Katie McCormick
a5e150c95c Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 2012-08-01 16:13:36 -07:00
Scott Main
97592ec3a5 am c221f35d: am a9a3c25a: am c9506415: Group revert of the following commits for design docs: 
* commit 'c221f35de3a5e76311d993a36f241e41d787ff2b':
  Group revert of the following commits for design docs:
 2012-08-01 16:11:26 -07:00
Scott Main
c221f35de3 am a9a3c25a: am c9506415: Group revert of the following commits for design docs: 
* commit 'a9a3c25a52e91346bb898e2d8c33f5c8fdd0295d':
  Group revert of the following commits for design docs:
 2012-08-01 16:09:29 -07:00
Scott Main
a9a3c25a52 am c9506415: Group revert of the following commits for design docs: 
* commit 'c9506415d533c61a9607c5b61a1993747bafb406':
  Group revert of the following commits for design docs:
 2012-08-01 16:07:18 -07:00
Katie McCormick
ec4ec27ea6 cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1 
Change-Id: I6342d1a3925d43719358d905fc29f2628c6e92b4
 2012-08-01 16:01:18 -07:00
Scott Main
c9506415d5 Group revert of the following commits for design docs: 
ce470e17fd4298c1b8aa9a5fd7493bde7a6be840
8874ab0473f4db10e71bf0537c0703db03bac4ee
bdd8d0fada73dabbda7f6f174c17317d1e30a79e
6443ca4cd9406ed8e9ba55461d4b2eb677aad17a
5ac5a324b377c8c5f29a3d368ebfdc76b0d02e3e
1edd4ae5c4748bd9d1e64f65dc554790063d59b8
be13fa0b7ac7929e65b1f3e40b2834ed0d9ed7ff
6a681afd38d9881154207436e5e145856e9d2f75
353474c0acdad9b8ffdb86d3d5f32137885dd720
2b1584c1d53cd1070d5157c07158828b4baf8844

Had to revert these because they're not ready to be published.

Change-Id: I704cf0df1db9aa159295bdf78e97cef9605addc6
 2012-08-01 15:51:29 -07:00
Rajeev Sharma
c1deaa221f Vignette filter: precompute more values, simplify math, cleanup code 
Change-Id: I29cfc313a5173fd393944dd9af58d0111a3d726a
 2012-08-01 15:46:30 -07:00
Ying Wang
4d11d8ff72 am 8c236ed5: (-s ours) am 880209e4: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '8c236ed5a84bebcf30057d77ed534bae1fd0c464':
  Import translations. DO NOT MERGE
 2012-08-01 15:34:01 -07:00
Ying Wang
8c236ed5a8 am 880209e4: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '880209e41215308a96ffc6d2eede1e830304bf58':
  Import translations. DO NOT MERGE
 2012-08-01 15:32:16 -07:00
Peter Ng
dc8d78b5e2 am a5ff3e55: am 8a90d746: am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography 
* commit 'a5ff3e554f393994770dad014db944c46b84791d':
  new confirming page and updates to progress and iconography
 2012-08-01 15:30:37 -07:00
Ying Wang
880209e412 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-01 15:29:17 -07:00
Peter Ng
a5ff3e554f am 8a90d746: am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography 
* commit '8a90d746ff85cc5e064a16b6db14b499469050b4':
  new confirming page and updates to progress and iconography
 2012-08-01 15:17:42 -07:00
The Android Open Source Project
d231d12609 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2012-08-01 15:16:11 -07:00
The Android Open Source Project
bde88e9702 am d0ad0931: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'd0ad0931fefa0e4444539858c0b3d4ce658c8d46':
 2012-08-01 15:15:48 -07:00
Ying Wang
53eb7a0744 Merge "Import translations. DO NOT MERGE" 2012-08-01 15:15:43 -07:00
Ying Wang
f35edb9317 Merge "Import translations. DO NOT MERGE" 2012-08-01 15:15:43 -07:00
Peter Ng
8a90d746ff am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography 
* commit '7bf18315505090f45cbe91ad025e772c3ea7ebc4':
  new confirming page and updates to progress and iconography
 2012-08-01 15:14:38 -07:00
Ying Wang
e34f48ce86 Merge "Import translations. DO NOT MERGE" 2012-08-01 15:14:28 -07:00
The Android Open Source Project
d0ad0931fe Reconcile with jb-mr1-release - do not merge 
Change-Id: I2a14632780e1a82c04a53ef60c7e4040a4fe0653
 2012-08-01 15:13:34 -07:00
Peter Ng
7bf1831550 am 2b1584c1: new confirming page and updates to progress and iconography 
* commit '2b1584c1d53cd1070d5157c07158828b4baf8844':
  new confirming page and updates to progress and iconography
 2012-08-01 15:12:26 -07:00
Chris Wren
bc26dc75c3 am c9d737dd: am 45aaa4a8: am 790474ba: am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev 
* commit 'c9d737dd8c5085d1a5717caa03a7d3d907d8afd1':
  Add missing docs to notification style rebuilder functions.
 2012-08-01 14:56:06 -07:00