Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,108 Commits 3 Branches 0 Tags
9529f2ce8a3c3ea9880ad29a82468b0291cd1fa2
Commit Graph

26108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
9529f2ce8a am 9b4b74be: am 294c9fb8: Improved graphics for the intruder alert. 
Merge commit '9b4b74becf0e99b0a9090758d6337c6615cff1d1'

* commit '9b4b74becf0e99b0a9090758d6337c6615cff1d1':
  Improved graphics for the intruder alert.
 2010-06-30 15:48:41 -07:00
Andreas Huber
7f35403a7a am 86405cbd: am caad0a5c: Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread 
Merge commit '86405cbd53f43529898000112bc9346c21569d26'

* commit '86405cbd53f43529898000112bc9346c21569d26':
  Support for vanilla YUV420sp => RGB565 color conversion.
 2010-06-30 15:48:37 -07:00
Doug Zongker
9ae3f66f14 am 6db0ef09: am 24c737cc: am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo 
Merge commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb'

* commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb':
  Verify hostname where possible, and clarify where not.
 2010-06-30 15:48:33 -07:00
Dianne Hackborn
0aa646736b Merge "resolved conflicts for merge of 7f6c6e8f to master" 2010-06-30 15:46:29 -07:00
Dianne Hackborn
25a98b8e21 resolved conflicts for merge of 7f6c6e8f to master 
Change-Id: Id9dddb78c51f16ff8c4b60339421c94fde506db2
 2010-06-30 15:44:58 -07:00
Michael Kolb
d62775b375 Merge "user agent string change: remove "Mobile" for large screen configuration" 2010-06-30 15:40:33 -07:00
Scott Main
b6643d90e6 am b2d1a71b: am 92dbad8a: am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style. 
Merge commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e'

* commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e':
  docs: revise menu guide to focus more on using menu resources
 2010-06-30 15:36:02 -07:00
Daniel Sandler
9b4b74becf am 294c9fb8: Improved graphics for the intruder alert. 
Merge commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e' into gingerbread-plus-aosp

* commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e':
  Improved graphics for the intruder alert.
 2010-06-30 15:33:25 -07:00
Andreas Huber
86405cbd53 am caad0a5c: Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread 
Merge commit 'caad0a5c6318678902402362df1791d286636344' into gingerbread-plus-aosp

* commit 'caad0a5c6318678902402362df1791d286636344':
  Support for vanilla YUV420sp => RGB565 color conversion.
 2010-06-30 15:33:09 -07:00
Doug Zongker
6db0ef09c4 am 24c737cc: am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo 
Merge commit '24c737ccdd64475178d53677f90a300fcfbab79f' into gingerbread-plus-aosp

* commit '24c737ccdd64475178d53677f90a300fcfbab79f':
  Verify hostname where possible, and clarify where not.
 2010-06-30 15:33:04 -07:00
Dianne Hackborn
7f6c6e8ffa am 3c80a4a0: Implement default key handling for native code. 
Merge commit '3c80a4a044865bdf1289c7896baffa1c082d835c' into gingerbread-plus-aosp

* commit '3c80a4a044865bdf1289c7896baffa1c082d835c':
  Implement default key handling for native code.
 2010-06-30 15:32:54 -07:00
Scott Main
b2d1a71bcc am 92dbad8a: am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style. 
Merge commit '92dbad8ab0c8e242c4c3e52c339ed3296ae7901c' into gingerbread-plus-aosp

* commit '92dbad8ab0c8e242c4c3e52c339ed3296ae7901c':
  docs: revise menu guide to focus more on using menu resources
 2010-06-30 15:32:28 -07:00
Chet Haase
cbf42ecef2 Merge "Initial checkin of new animation system. package, APIs, functionality all subject to change. package is hidden for now." 2010-06-30 15:27:33 -07:00
Mike Lockwood
81ea83d108 Move MTP JNI code from libandroid_runtime to libmedia_jni 
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
 2010-06-30 17:54:10 -04:00
Michael Kolb
a172e7d0d9 user agent string change: remove "Mobile" for large screen configuration 
bug: http://b/issue?id=2778676

Change-Id: I268d8c0f8834bdbd099d59fdbc462da26234241a
 2010-06-30 14:50:02 -07:00
Chet Haase
17fb4b0d1c Initial checkin of new animation system. package, APIs, functionality all subject to change. package is hidden for now. 
Change-Id: Ieca54cd1f09c171abb5adc6419ff337083f586be
 2010-06-30 14:49:13 -07:00
Mike Lockwood
767c5e4be0 MTP: Implement GetObjectPropDesc 
Change-Id: I283651257254fc9cd9d93eab4605c5e33d3db93e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-30 17:02:07 -04:00
Mike Lockwood
98ef64e4a8 MTP: Add MtpServer Java class to wrap MTP device support. 
Change-Id: I818c2d3b3f52ad5bb515acc4d3288b2b43e11908
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-30 17:02:07 -04:00
Alex Sakhartchouk
071508d9f3 Removing font initialization on startup 
Change-Id: I6f28204c3d431955fbf0f2f74dde09012bba0a4d
 2010-06-30 12:59:01 -07:00
Daniel Sandler
294c9fb899 Improved graphics for the intruder alert. 
Change-Id: I9aa6c8995da39f332b724fabe67ed5efe584552f
 2010-06-30 15:32:26 -04:00
Jason Sams
e519b37f5a Fix an uninitialized pointer. 
Change-Id: If66a502b6b23d00c4a2dd02fb46912f6dee2866b
 2010-06-30 12:07:50 -07:00
Andreas Huber
caad0a5c63 Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread 2010-06-30 11:32:31 -07:00
Doug Zongker
24c737ccdd am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo 
Merge commit 'd581484ef8fac80c15ebf652e66f918374df5109' into gingerbread

* commit 'd581484ef8fac80c15ebf652e66f918374df5109':
  Verify hostname where possible, and clarify where not.
 2010-06-30 11:17:00 -07:00
Doug Zongker
d581484ef8 Merge "Verify hostname where possible, and clarify where not." into froyo 2010-06-30 11:12:19 -07:00
Mike Lockwood
9823d203f2 Merge "MTP: replace printfs with logcat" 2010-06-30 11:03:41 -07:00
Mike Lockwood
3e6616dd3d MTP: replace printfs with logcat 
Change-Id: I2c30921098e2dc049dc5fc1e0a548ead33c363e0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-30 13:59:32 -04:00
Brian Carlstrom
2658cf47e5 Merge "frameworks/base updates to track merge from dalvik-dev - frameworks and CoreTests modules now depend on bouncycastle - update preloades classes for NativeBN package change - moved CryptoTest to libcore - updated api" 2010-06-30 10:55:07 -07:00
Dianne Hackborn
3c80a4a044 Implement default key handling for native code. 
The native code now maintains a list of all keys that may use
default handling.  If the app finishes one of these keys
without handling it, the key will be passed back off to Java
for default treatment.

Change-Id: I6a842a0d728eeafa4de7142fae573f8c11099e18
 2010-06-30 10:49:40 -07:00
Ben Murdoch
08968fa59e Merge "Receive notification from native webcore that the page being viewed has marked itself as being an installable web app. Default implementation in the WebChromeClient does nothing." 2010-06-30 10:35:08 -07:00
Andreas Huber
c543a21a40 Support for vanilla YUV420sp => RGB565 color conversion. 
Change-Id: I22e5b554909e169eaf153d1f25b636f6f04a1871
 2010-06-30 10:32:39 -07:00
Scott Main
92dbad8ab0 am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style. 
Merge commit 'b4d2e42a8508a09f944b13f27c043952eef6c1cc' into gingerbread

* commit 'b4d2e42a8508a09f944b13f27c043952eef6c1cc':
  docs: revise menu guide to focus more on using menu resources
 2010-06-30 09:01:01 -07:00
Mike Lockwood
3dcfeac890 am 2a28f4b4: am 5b8364a9: GPS: stifle some logging 
Merge commit '2a28f4b40c36ab3a8a80467eb5781ae6e5811369'

* commit '2a28f4b40c36ab3a8a80467eb5781ae6e5811369':
  GPS: stifle some logging
 2010-06-30 07:07:06 -07:00
Mike Lockwood
2a28f4b40c am 5b8364a9: GPS: stifle some logging 
Merge commit '5b8364a929e26b30d55de9d330e1cb9a11df6208' into gingerbread-plus-aosp

* commit '5b8364a929e26b30d55de9d330e1cb9a11df6208':
  GPS: stifle some logging
 2010-06-30 07:04:28 -07:00
Mike Lockwood
5b8364a929 GPS: stifle some logging 
Change-Id: Ifc68f27a6cb841240db182f4c77ddd8085a8c149
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-30 09:59:46 -04:00
Brian Carlstrom
570bb5618a frameworks/base updates to track merge from dalvik-dev 
- frameworks and CoreTests modules now depend on bouncycastle
- update preloades classes for NativeBN package change
- moved CryptoTest to libcore
- updated api

Change-Id: I47363a463f074af205b5bd128cd98faab70ac849
 2010-06-30 00:54:29 -07:00
Dan Egnor
7fc93c36ae Verify hostname where possible, and clarify where not. 
Bug: 2807409
Change-Id: I6f6a6b22a48149d9f1f45ff8f53103b25706ecc0
 2010-06-29 19:19:10 -07:00
Adam Powell
0e94b5151d Add subtitles for action bars and context modes. 
Fix an issue where context mode content was cleared before animating out.

Change-Id: Ie7a065e65bc18e3da32de07543d0f71d2a2d648c
 2010-06-29 19:00:15 -07:00
James Dong
bd800f40ac am 42dd9908: am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread 
Merge commit '42dd99084d0069ccd90f0305ce374fd943a09de7'

* commit '42dd99084d0069ccd90f0305ce374fd943a09de7':
  Added encoding parameters set up for H263 video encoder
 2010-06-29 17:30:42 -07:00
James Dong
42dd99084d am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread 
Merge commit 'f7679a0493d59da8c759a6be639be5110c50fb98' into gingerbread-plus-aosp

* commit 'f7679a0493d59da8c759a6be639be5110c50fb98':
  Added encoding parameters set up for H263 video encoder
 2010-06-29 17:27:29 -07:00
James Dong
f7679a0493 Merge "Added encoding parameters set up for H263 video encoder" into gingerbread 2010-06-29 17:24:10 -07:00
Scott Main
b4d2e42a85 docs: revise menu guide to focus more on using menu resources 
instead of defining menus in code.
And revise some style.

Change-Id: I0a5a19a51062d72cdb9045c9607cab04b69f554c
 2010-06-29 17:13:02 -07:00
Chris Tate
41254a8ddd am af4a2d1f: am ddcb543a: Merge "Fix native input dispatch in the emulator." into gingerbread 
Merge commit 'af4a2d1f52c7d54408db341781399d2886de72c1'

* commit 'af4a2d1f52c7d54408db341781399d2886de72c1':
  Fix native input dispatch in the emulator.
 2010-06-29 17:06:31 -07:00
Chris Tate
af4a2d1f52 am ddcb543a: Merge "Fix native input dispatch in the emulator." into gingerbread 
Merge commit 'ddcb543ac8d9615ea78fbf8341949f54d86e6fbc' into gingerbread-plus-aosp

* commit 'ddcb543ac8d9615ea78fbf8341949f54d86e6fbc':
  Fix native input dispatch in the emulator.
 2010-06-29 17:03:43 -07:00
Chris Tate
ddcb543ac8 Merge "Fix native input dispatch in the emulator." into gingerbread 2010-06-29 17:01:04 -07:00
Jeff Brown
0b72e82c5f Fix native input dispatch in the emulator. 
Set a default orientation of ROTATION_0.
Added some more careful checks based on whether we have valid
absolute axis information from the driver.
Reset key repeating during configuration changes since the keyboard
device may have been removed.

Change-Id: I685960828acffcb17595fc5683309e8064a76714
 2010-06-29 16:52:21 -07:00
James Dong
c0ab2a6458 Added encoding parameters set up for H263 video encoder 
Also:
- Allowed start() call when encoder already starts and stop() call when encoder has not started yet
- Handled default value for audio/video sources/encoders and file output format

Change-Id: I03b2f7d3cf570baa0fd011a8c0ad200f2f2a5da1
 2010-06-29 16:44:19 -07:00
Scott Main
8c464e811f am 7c8ca29e: am e42b1867: am 4fb91d9f: docs: fix typo 
Merge commit '7c8ca29e7097fa10b9e4c442a93fe05ded5e0d79'

* commit '7c8ca29e7097fa10b9e4c442a93fe05ded5e0d79':
  docs: fix typo
 2010-06-29 15:52:30 -07:00
Scott Main
7c8ca29e70 am e42b1867: am 4fb91d9f: docs: fix typo 
Merge commit 'e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf' into gingerbread-plus-aosp

* commit 'e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf':
  docs: fix typo
 2010-06-29 15:49:37 -07:00
Scott Main
e42b18677e am 4fb91d9f: docs: fix typo 
Merge commit '4fb91d9f1bede8ad49365913804532ca57206455' into gingerbread

* commit '4fb91d9f1bede8ad49365913804532ca57206455':
  docs: fix typo
 2010-06-29 15:47:42 -07:00
Mathias Agopian
e595a547fc am 33df868b: am 1eb442ee: Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread 
Merge commit '33df868bb35726d250c8a6d0ebd8c84749ffd51f'

* commit '33df868bb35726d250c8a6d0ebd8c84749ffd51f':
  remove a hack that was used only used on h/w we no longer support.
 2010-06-29 15:36:53 -07:00