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

86106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Monsen
f77e52e110 am 5710a2f1: am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 
* commit '5710a2f1269180c169855b98a8d33f2f12ced1a1':
  Deprecating methods (and a constant) for JB MR1
 2012-09-12 17:02:11 -07:00
The Android Open Source Project
3ffee6ac03 am da88c8b0: (-s ours) am 568e3ebb: am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'da88c8b0108b9fe4e319511149a347e382969c2e':
  Fix notification gestures.
  Single finger notification expansion.
 2012-09-12 16:59:23 -07:00
The Android Open Source Project
f119384a08 am 2b2b53c7: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '2b2b53c713001008b446c8ee17911fb199622160':
  Fixing issue with Airplane Mode. (Bug 7141144)
  Update airplane-mode manipulation for the new Settings namespace
  Check for null ViewRootImpl when saving accessibility focus in ListView.
  Reset GL buffer state after functor invocation
  Copy all mutable state before sending to clients.
  Disable wifi display API when the adapter is not registered.
  Wrapped call to notifyAll() in a synchronized block
  Fix EmergencyDialer button on devices without telephony hardware
 2012-09-12 16:59:06 -07:00
Jeff Sharkey
116be95495 Merge commit '81eb7640' into mergeit 
Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350
 2012-09-12 16:34:31 -07:00
Daniel Sandler
7b75adaafc am 2966351b: am 8a0e1fef: am b8026996: (-s ours) am e445c258: Merge "Fix notification gestures." into jb-dev 
* commit '2966351be2f670eaef5f69e25d3169cb9274edc1':
  Fix notification gestures.
 2012-09-12 15:36:13 -07:00
Daniel Sandler
9196a1ec7d am 1bd62602: am ec4c62bf: am 2da1e221: (-s ours) am a5e042f9: Merge "Single finger notification expansion." into jb-dev 
* commit '1bd6260235ed0339400295ae248ecd4c2837b11c':
  Single finger notification expansion.
 2012-09-12 15:36:09 -07:00
Jeff Brown
eda63986fe am 81da4c77: am c7b6ec7a: Merge "Improve reporting of wifi connection state." into jb-mr1-dev 
* commit '81da4c7780134b4ed5d37872b198fb6ad01b3885':
  Improve reporting of wifi connection state.
 2012-09-12 15:35:48 -07:00
Svetoslav Ganov
3acdb339ac am e020020f: am 5e900e3a: Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev 
* commit 'e020020f218550c97d1011c7eb6221d14fe1ea33':
  Adding a scaling threshold in ScreenMagnifier
 2012-09-12 15:35:41 -07:00
Jean-Baptiste Queru
687e4ccea8 am cdb22217: am d057e73e: am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit 'cdb22217cf4935e8711b232af8bc35f8d762fe3d':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-12 15:35:32 -07:00
Svetoslav Ganov
f210e776a0 am 0d6e17b4: am b1ee5886: Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev 
* commit '0d6e17b468f00c37025bf3a0a733a49084f7ab0b':
  Refactoring the scale and pan detection in the ScreenMagnifier.
 2012-09-12 15:35:24 -07:00
Romain Guy
3a408c2121 am 0c5e2cfd: am 0585744a: Merge "Discard framebuffer commands when we redraw the entire buffer" into jb-mr1-dev 
* commit '0c5e2cfd1cfdc0c314870cee55c3cefd134283b1':
  Discard framebuffer commands when we redraw the entire buffer
 2012-09-12 15:35:19 -07:00
Winson Chung
2ded0a3a7a am 4bd63054: am 709c542b: Merge "Fixing crash in emulator due to missing bluetooth." into jb-mr1-dev 
* commit '4bd63054bbe489d951bb621f0037f401ee3055f2':
  Fixing crash in emulator due to missing bluetooth.
 2012-09-12 15:35:13 -07:00
Benoit Goby
8e1ea422e6 am d5e19031: am 73e0d75c: Merge "UsbDebuggingActivity: Strings update after review" into jb-mr1-dev 
* commit 'd5e190312dfe196fb61e70b6a916e479026ad9c4':
  UsbDebuggingActivity: Strings update after review
 2012-09-12 15:34:49 -07:00
Amith Yamasani
3727f5cf05 am ac3ef9db: am 9c673b05: Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev 
* commit 'ac3ef9dbe11090898d8aafec27c536c7934c6f7e':
  Go back to keyguard if user is switched in lock screen
 2012-09-12 15:34:43 -07:00
Svetoslav Ganov
d381c620ed am 2b5c5b64: am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev 
* commit '2b5c5b640d170518ac9ddc289a49340e54ff39d0':
  Screen magnifier should handle window rebuilds correctly.
 2012-09-12 15:34:32 -07:00
Irfan Sheriff
25f08bef74 am 8a2cf2ca: am 85cf4a15: Merge "Disable suspend optimizations during DHCP" into jb-mr1-dev 
* commit '8a2cf2ca3dd9a497ab972a8d72d802f0cf2522da':
  Disable suspend optimizations during DHCP
 2012-09-12 15:34:29 -07:00
Scott Main
15f3950a48 am 1d9d12d5: am 6434d733: am 91de90da: am 01f9bf3f: small update to the ADT installation steps based on new ADT UI 
* commit '1d9d12d5d4981b0354be7203b015eaf4cf6b4f56':
  small update to the ADT installation steps based on new ADT UI
 2012-09-12 15:34:25 -07:00
Jason Sams
a2fd0f7f1d am 0353efc1: am 1e26a8b3: Merge "LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test" into jb-mr1-dev 
* commit '0353efc1ca549d9a4d817a42b0a2277e3a3cfa9d':
  LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test
 2012-09-12 15:34:21 -07:00
Christopher Tate
a25bbca8cc am ae25805d: am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev 
* commit 'ae25805d2063d81d3e8ae786b0d972b666c5cf18':
  Set up default (random) Android IDs for all users
 2012-09-12 15:34:18 -07:00
Robert Greenwalt
dd912320ff am f02e72d9: am f008ab72: am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit 'f02e72d99f5d1fc05ea31676d13e7fd1e8b65c1f':
  EthernetDataTracker: indicate link up based on flags
 2012-09-12 15:34:09 -07:00
Selim Gurun
c5c68d9789 am 77f02ca9: am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev 
* commit '77f02ca908e114df2e14a7671824f3374a509280':
  Deleting the defunct SearchBox interface.
 2012-09-12 15:28:53 -07:00
JP Abgrall
aef50dd148 am 0c6f1737: am d428e95e: Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev 
* commit '0c6f17370ae99b9bdd073327cad9610f08418d02':
  core: config: Update the description of the autoBrightnessLevels array.
 2012-09-12 15:28:33 -07:00
Jim Miller
1de266cd53 am 57db8bc4: am 752ef4e0: Merge "This enables the back button in keyguard" into jb-mr1-dev 
* commit '57db8bc4257ba05f0996490b90a57705d6ef0e6c':
  This enables the back button in keyguard
 2012-09-12 15:28:29 -07:00
Adam Cohen
5addfd5eb5 am d94fc289: am b0246ce1: Merge "Fixing build (update-api)" into jb-mr1-dev 
* commit 'd94fc289f5a4eb938db9331fc8ed9e9f9c669255':
  Fixing build (update-api)
 2012-09-12 15:28:25 -07:00
Jeff Brown
984f157366 am 2eb82513: am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev 
* commit '2eb82513bd448757250dc8245e9c29c747397608':
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.
 2012-09-12 15:28:20 -07:00
Selim Gurun
2137aa2afc am cccad2d8: am faed98a1: Merge "Added annotations for injected accessibility objects" into jb-mr1-dev 
* commit 'cccad2d8c2ea309a73b9408f8c36e7d964627570':
  Added annotations for injected accessibility objects
 2012-09-12 15:15:04 -07:00
Wink Saville
6946940fff am fa9cae7e: am ea4f446a: am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum" 
* commit 'fa9cae7e919e0f9a3f637c7a43838942641d2645':
  Telephony: Clarify IccCardConstants.State enum
 2012-09-12 15:15:01 -07:00
Adam Cohen
3f3a60a037 am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev 
* commit '2664f94f209100abacbfc857c33eac784f0fd6cf':
  Adding notion of keyguard widgets
 2012-09-12 15:14:57 -07:00
Jim Miller
e19ca70c71 am 68cfbf21: am ea42443e: Merge "Attempt to fix blank keyguard issue" into jb-mr1-dev 
* commit '68cfbf21d4576af7b983e359c033fe72d9cb2f89':
  Attempt to fix blank keyguard issue
 2012-09-12 15:14:46 -07:00
Eino-Ville Talvala
21616b27ff am 64791aab: am ff5c9146: Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev 
* commit '64791aabd4f16df4adf5ec6adf97aa2b0633dd6c':
  NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
 2012-09-12 15:14:35 -07:00
Svetoslav Ganov
bb4a9840a5 am 7abd5cfa: am c574fd04: Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev 
* commit '7abd5cfacf3be80f79d4a01f1a60b4b7bfb411f6':
  Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
 2012-09-12 15:14:21 -07:00
Selim Gurun
41ecd35fd9 am 3591fa3b: am 2fa10c67: Fix build break 
* commit '3591fa3bcd6c5204c6b0d470a186535b65b14042':
  Fix build break
 2012-09-12 15:14:09 -07:00
Eino-Ville Talvala
ef492d3da3 am 94aa95be: am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev 
* commit '94aa95beca8482bb8f5cf9f9bd0c26b9738d2f51':
  Camera: Add SCENE_MODE_HDR.
 2012-09-12 15:14:05 -07:00
Fabrice Di Meglio
d3cf8acc80 am 38279225: am 5cf8bd79: Merge "Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware" into jb-mr1-dev 
* commit '3827922569c89e0c34c7b8cc5df6ca8d7af563d5':
  Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware
 2012-09-12 15:14:00 -07:00
Kenny Root
bbf4fc22f7 am dba90626: am a3618092: Merge "Remove "unlinklib" command from installd" into jb-mr1-dev 
* commit 'dba90626d3e8e0a9993bbc9d30094a0764dc3f55':
  Remove "unlinklib" command from installd
 2012-09-12 15:13:57 -07:00
Amith Yamasani
253730061d am 59337ae6: am 8015f039: Merge "Enforce a user limit" into jb-mr1-dev 
* commit '59337ae684d62c644827d782456d659b3effcef6':
  Enforce a user limit
 2012-09-12 15:13:53 -07:00
Eino-Ville Talvala
e8eb5951b2 am 9725ff46: am 6fc7275d: Merge "Camera: Add enableShutterSound method." into jb-mr1-dev 
* commit '9725ff46c445f9d259bdee18ed86072a937ba117':
  Camera: Add enableShutterSound method.
 2012-09-12 15:13:46 -07:00
Selim Gurun
5977ecef0e am a7a5fa82: am 06ee8cde: Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev 
* commit 'a7a5fa82cc997953b0206c4dd1d2ecc1b27f0cf2':
  Remove defunct searchbox implementation from webview.
 2012-09-12 15:13:43 -07:00
Irfan Sheriff
565717e612 am abee4a76: am f625436c: Merge "Handle ascii encoded SSID" into jb-mr1-dev 
* commit 'abee4a7695b05736a0b53da71d3e98b5e7254531':
  Handle ascii encoded SSID
 2012-09-12 15:13:37 -07:00
Mike Lockwood
6a552001a3 am a3f1b508: am 25da9375: Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev 
* commit 'a3f1b5086bfee67ef2efd4398381af99e314855e':
  MtpDatabase: Fix typo affecting parent and format queries
 2012-09-12 15:13:30 -07:00
Scott Main
9a605bcfe0 am f7b133be: am 8b9e467d: am c02b5008: am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev 
* commit 'f7b133be571466a1ccea5b91c0503d6653c0cd1a':
  docs: update for multi apk doc for ABI support
 2012-09-12 15:13:26 -07:00
Jean-Michel Trivi
cc9387be99 am dff22ac7: am 660c8a11: Merge "Add support for controlling remote submix audio routing" into jb-mr1-dev 
* commit 'dff22ac7bbf80c849cda96ff2b0f6618a35b86bd':
  Add support for controlling remote submix audio routing
 2012-09-12 15:13:20 -07:00
Winson Chung
4d571f1d84 am fcde3a44: am db425bbb: Merge "Fixing issue with Airplane Mode. (Bug 7141144)" into jb-mr1-dev 
* commit 'fcde3a44da4a792fc88f8700d913a7f0155934ba':
  Fixing issue with Airplane Mode. (Bug 7141144)
 2012-09-12 13:18:12 -07:00
John Spurlock
4170af8bab am 6beb7220: am 9f750af6: Update the dream manager to be multi-user aware. 
* commit '6beb72204346fe75f763592462c9bc2a0b560533':
  Update the dream manager to be multi-user aware.
 2012-09-12 13:17:57 -07:00
Dianne Hackborn
dea6f14dc0 Merge "resolved conflicts for merge of 8bb779bd to master" 2012-09-12 13:15:07 -07:00
Dianne Hackborn
f41d25a2f5 resolved conflicts for merge of 8bb779bd to master 
Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052
 2012-09-12 10:55:03 -07:00
Kristian Monsen
5710a2f126 am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 
* commit 'bd0fe8783407bc760b8e9a9952cb96a600d26ea9':
  Deprecating methods (and a constant) for JB MR1
 2012-09-12 09:37:13 -07:00
Kristian Monsen
bd0fe87834 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 2012-09-12 09:34:37 -07:00
The Android Open Source Project
da88c8b010 am 568e3ebb: am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '568e3ebb5e7814fb68179a9755a686a0e1deec70':
  Fix notification gestures.
  Single finger notification expansion.
 2012-09-12 07:53:59 -07:00
The Android Open Source Project
568e3ebb5e am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '4b0764eef22e3244d3f45fbda1e093ff11986f5f':
  Fix notification gestures.
  Single finger notification expansion.
 2012-09-12 07:51:44 -07:00