Commit Graph

16504 Commits

Author SHA1 Message Date
Doug Zongker
b8df3c8b5e 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
590d4124ba 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
53c82444ef 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
Doug Zongker
0b2274607d 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
a71f3aff40 Merge "Verify hostname where possible, and clarify where not." into froyo 2010-06-30 11:12:19 -07:00
Dianne Hackborn
189ed23c10 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
Scott Main
42e7c9734b 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
f769116c30 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
James Dong
36418af6e1 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
d89f22b9a8 Merge "Added encoding parameters set up for H263 video encoder" into gingerbread 2010-06-29 17:24:10 -07:00
Chris Tate
d356f5c3e1 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
d5d7b97b52 Merge "Fix native input dispatch in the emulator." into gingerbread 2010-06-29 17:01:04 -07:00
Jeff Brown
4036f7f2b4 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
Scott Main
a9757c73f4 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
4f67b16b7d 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
c6d260907c am 1eb442ee: Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread
Merge commit '1eb442eef737051bd2734d823fa4c12c17c1da36' into gingerbread-plus-aosp

* commit '1eb442eef737051bd2734d823fa4c12c17c1da36':
  remove a hack that was used only used on h/w we no longer support.
2010-06-29 15:35:13 -07:00
Mathias Agopian
c8df407af6 Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread 2010-06-29 15:33:36 -07:00
Mathias Agopian
5d8f41cab1 remove a hack that was used only used on h/w we no longer support.
this should fix the opal build.

Change-Id: I43d7633696fea5be6bc834293a832d22f6bdfc61
2010-06-29 15:31:58 -07:00
The Android Open Source Project
6b1586c563 am 2533a6ad: set up fast-forward from froyo-release to gingerbread
Merge commit '2533a6ad3f378db5f160546d10345730f68d676c' into gingerbread-plus-aosp

* commit '2533a6ad3f378db5f160546d10345730f68d676c': (22 commits)
  Properly note the current active restore set's token
  Do not log AT command traffic by default.
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
  TimedEventQueue is apparently important for glitch-free media playback, and so
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
  When filling the cache, we always time out waiting for a condition that won't occur.
  Respond to changes in throttle policy.
  Fix Tethering of multiple downstream ifaces.
  Update Framework to support multiple dhpc ranges
  Dumb late-night typo.
  Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
  Clean up changing AP configuration
  Grant permissions to apps on sd when enabling/disabling packages.
  Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
  Switch default install location to unspecified.
  Fix problem with calling onConfigurationChanged() too much.
  Preserve widgets on upgrade.
  Need to keep new package's cert when using original-package.
  Pick up default install location
  Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
  ...
2010-06-29 14:38:47 -07:00
The Android Open Source Project
e34537b3c6 set up fast-forward from froyo-release to gingerbread
Change-Id: I22fc9465f5d8a0144b31803f431602fe3bda516a
2010-06-29 14:34:35 -07:00
Daniel Sandler
ea45e4bb89 am 5d7f6e61: Merge "Support for tapping on an immersive-mode priority notification." into gingerbread
Merge commit '5d7f6e614e7ead1fbe40a6886f78c31809bcbd40' into gingerbread-plus-aosp

* commit '5d7f6e614e7ead1fbe40a6886f78c31809bcbd40':
  Support for tapping on an immersive-mode priority notification.
2010-06-29 12:30:35 -07:00
Daniel Sandler
0c9c6f85b0 Merge "Support for tapping on an immersive-mode priority notification." into gingerbread 2010-06-29 12:28:07 -07:00
Dianne Hackborn
67946c92ee am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread
Merge commit '0934fbb6b81006fdf6a76b6519201d2f472a1908' into gingerbread-plus-aosp

* commit '0934fbb6b81006fdf6a76b6519201d2f472a1908':
  Update native activity & event APIs to follow correct conventions.
2010-06-29 12:18:58 -07:00
Dianne Hackborn
78676fdee8 Merge "Update native activity & event APIs to follow correct conventions." into gingerbread 2010-06-29 12:17:20 -07:00
Andreas Huber
518cf72beb am fd751426: Merge "Add qcom\'s new OMX components to the list." into gingerbread
Merge commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5' into gingerbread-plus-aosp

* commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5':
  Add qcom's new OMX components to the list.
2010-06-29 11:48:57 -07:00
Andreas Huber
f79d3b8539 Merge "Add qcom's new OMX components to the list." into gingerbread 2010-06-29 11:45:39 -07:00
Xia Wang
0f0bc251cb am 120a58fb: Extend unit test framework for Wifi soft AP configuration Add test case: testApSsidWithAlphabet
Merge commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a' into gingerbread-plus-aosp

* commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a':
  Extend unit test framework for Wifi soft AP configuration
2010-06-29 11:32:09 -07:00
Dianne Hackborn
9c7f8186ae Update native activity & event APIs to follow correct conventions.
Change-Id: Ie64fb3a9c68bc9c117fa5621b75d1f609e304e0e
2010-06-29 10:43:54 -07:00
Mike Lockwood
84a5de824f am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast.
Merge commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84' into gingerbread-plus-aosp

* commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84':
  Make android.hardware.action.USB_STATE a protected broadcast.
2010-06-29 09:17:36 -07:00
Joe Onorato
e802bddfa1 am 1c95ecb4: recombine StatusBarService and PhoneStatusBarService
Merge commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9' into gingerbread-plus-aosp

* commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9':
  recombine StatusBarService and PhoneStatusBarService
2010-06-29 08:04:13 -07:00
Joe Onorato
3ad5690c3f am b54ef614: Separate the status bar height from the icon size.
Merge commit 'b54ef61434eb82a53d8c840d86d1d656215604f9' into gingerbread-plus-aosp

* commit 'b54ef61434eb82a53d8c840d86d1d656215604f9':
  Separate the status bar height from the icon size.
2010-06-29 08:02:10 -07:00
Mike Lockwood
8cc3228f37 am de6bd120: Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'de6bd120c97bb7986a6bac3889288f77bca63288' into gingerbread-plus-aosp

* commit 'de6bd120c97bb7986a6bac3889288f77bca63288':
  Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-06-29 05:27:11 -07:00
Mike Lockwood
65a6cf7626 am 606d591a: Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread
Merge commit '606d591afee24e31e3885a7330638893db1710f5' into gingerbread-plus-aosp

* commit '606d591afee24e31e3885a7330638893db1710f5':
  Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
2010-06-29 05:27:08 -07:00
Mike Lockwood
0c3af05e12 Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-06-29 05:24:45 -07:00
Mike Lockwood
24c2ff830d Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread 2010-06-29 05:24:22 -07:00
Mathias Agopian
2eb4ed53c1 am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread
Merge commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407' into gingerbread-plus-aosp

* commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407':
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:04:23 -07:00
Mathias Agopian
f8e79cc372 Merge changes I93dfc4c8,I781953d6 into gingerbread
* changes:
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:01:58 -07:00
Mathias Agopian
05650aec9f fix[2798925] Gingerbread TOT not booting
Fixed a typo where checking against the wrong constant caused GL_TEXTURE_EXTERNAL_OES
to be used with a regular texture, which some GL driver will choke on.

Change-Id: I93dfc4c8fa674433bbb678eee31954e9a8d0cb4b
2010-06-28 19:54:17 -07:00
Chris Tate
4512638911 am 31e0ffe8: Merge "Native input event dispatching." into gingerbread
Merge commit '31e0ffe8444b70500cac319da084c4c45e62aca2' into gingerbread-plus-aosp

* commit '31e0ffe8444b70500cac319da084c4c45e62aca2':
  Native input event dispatching.
2010-06-28 19:14:18 -07:00
Chris Tate
b14c3e7e93 Merge "Native input event dispatching." into gingerbread 2010-06-28 19:12:55 -07:00
Jeff Brown
50de30a523 Native input event dispatching.
Target identification is now fully native.
Fixed a couple of minor issues related to input injection.
Native input enabled by default, can be disabled by setting
WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH to false.

Change-Id: I7edf66ed3e987cc9306ad4743ac57a116af452ff
2010-06-28 19:10:54 -07:00
James Dong
7da1562254 am d4760c24: Collect statistical data from authoring engine (second part)
Merge commit 'd4760c243fb129ebda43972c0fadf43a02c9849f' into gingerbread-plus-aosp

* commit 'd4760c243fb129ebda43972c0fadf43a02c9849f':
  Collect statistical data from authoring engine (second part)
2010-06-28 17:28:07 -07:00
James Dong
4644f0fe94 am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread
Merge commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587' into gingerbread-plus-aosp

* commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587':
  Separate MediaRecorderClient with MediaPlayerClient
2010-06-28 16:25:39 -07:00
James Dong
e1b6c6fe6f Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread 2010-06-28 16:19:40 -07:00
Scott Main
3fb395dc2e am f2b544f5: am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit 'f2b544f5ae7676f7ab4cdf3379b2ed3c60a65def' into gingerbread-plus-aosp

* commit 'f2b544f5ae7676f7ab4cdf3379b2ed3c60a65def':
  docs: update backup guide and bmgr tool
2010-06-28 15:34:37 -07:00
Scott Main
a84687252b am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit '337b0873f43eac5f23483bec94bd8729f79d47ec' into gingerbread

* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
  docs: update backup guide and bmgr tool
2010-06-28 15:31:35 -07:00
Wei Huang
6598367dd3 am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread
Merge commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33' into gingerbread-plus-aosp

* commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33':
  new presence icons for video/audio chats.
2010-06-28 15:08:37 -07:00
Wei Huang
d8b9035a1c Merge "new presence icons for video/audio chats." into gingerbread 2010-06-28 15:05:56 -07:00
Daniel Sandler
7a3b87e0a6 am 5dbd05ed: Intruder alert! (First try at the immersive-mode alert bar.)
Merge commit '5dbd05ed18906be3499978303f2fca4f86211567' into gingerbread-plus-aosp

* commit '5dbd05ed18906be3499978303f2fca4f86211567':
  Intruder alert! (First try at the immersive-mode alert bar.)
2010-06-28 14:22:17 -07:00
Chih-Chung Chang
d57b2a6ce9 am de1057c4: Unhide new API for supporting multiple cameras.
Merge commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb' into gingerbread-plus-aosp

* commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb':
  Unhide new API for supporting multiple cameras.
2010-06-27 20:49:42 -07:00