Commit Graph

16524 Commits

Author SHA1 Message Date
Joe Onorato
692919be30 am a2dd4c17: put the status bar back in the system process
Merge commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4' into gingerbread-plus-aosp

* commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4':
  put the status bar back in the system process
2010-07-01 05:01:52 -07:00
Joe Onorato
530de461e1 am 6be4739e: quiet noisy debug spew
Merge commit '6be4739e1b302eb447dee195eaecbfcf82317310' into gingerbread-plus-aosp

* commit '6be4739e1b302eb447dee195eaecbfcf82317310':
  quiet noisy debug spew
2010-07-01 05:01:48 -07:00
Chih-Chung Chang
48cf5b1954 am 09b90057: Add multiple camera support for in MediaProfiles.
Merge commit '09b9005769f2b717f637131578ce6cfa6bd62bd9' into gingerbread-plus-aosp

* commit '09b9005769f2b717f637131578ce6cfa6bd62bd9':
  Add multiple camera support for in MediaProfiles.
2010-06-30 20:22:40 -07:00
Christopher Tate
c6466bfb57 am 160edb36: Add ability to guard a thread against setting its own prio to bg
Merge commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b' into gingerbread-plus-aosp

* commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b':
  Add ability to guard a thread against setting its own prio to bg
2010-06-30 18:28:08 -07:00
Dianne Hackborn
d729836ff8 am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp

* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
  Introduce official public NativeWindow type.
2010-06-30 16:08:24 -07:00
Dianne Hackborn
e12e3d7692 Merge "Introduce official public NativeWindow type." into gingerbread 2010-06-30 16:05:30 -07:00
Mathias Agopian
aca61c7eb2 am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread
Merge commit '30fe6fa07a9b9c6e7498198608125add8eb40744' into gingerbread-plus-aosp

* commit '30fe6fa07a9b9c6e7498198608125add8eb40744':
  fix live wallpapers on Droid
2010-06-30 16:01:33 -07:00
The Android Open Source Project
743aa84b28 merge from open-source master
Change-Id: I99a88f61bc0f3ddcc233b6784e24427a7f8978be
2010-06-30 15:59:42 -07:00
Mathias Agopian
05dedd17ec Merge "fix live wallpapers on Droid" into gingerbread 2010-06-30 15:59:02 -07:00
Mathias Agopian
a8f3e4e53c fix live wallpapers on Droid
On omap3 h/w we force opaque formats to RGB_565 instead of RGBX_8888
because the GL driver doesn't support it. RGBX_8888 is always remapped
to RGBA_8888.

Change-Id: I0bfabeb98c8d3a399079e6797cf2a0ee95915324
2010-06-30 15:43:47 -07:00
Jeff Brown
2427ff8529 am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread
Merge commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712' into gingerbread-plus-aosp

* commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712':
  Fix injection of specially intercepted keys like HOME.
2010-06-30 15:33:41 -07:00
Christopher Tate
13eb402508 am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread
Merge commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08' into gingerbread-plus-aosp

* commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08':
  Remove memory monitoring from the system watchdog
2010-06-30 15:33:35 -07:00
Daniel Sandler
513c0e9795 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
420a4be1ec 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
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
Dianne Hackborn
4b5e91e482 Introduce official public NativeWindow type.
Not yet hooked up to anything in the NDK, but requires renaming
the existing android_native_window_t type everywhere.

Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e
2010-06-30 15:32:04 -07:00
Jeff Brown
3813eebfa8 Merge "Fix injection of specially intercepted keys like HOME." into gingerbread 2010-06-30 15:03:04 -07:00
Christopher Tate
2b682a853e Merge "Remove memory monitoring from the system watchdog" into gingerbread 2010-06-30 14:55:44 -07:00
Jeff Brown
c393eb6cf5 Fix injection of specially intercepted keys like HOME.
This change mainly unwinds a premature optimization in the
dispatch pipeline.
To test HOME injection, run 'adb shell input keyevent 3'.

Change-Id: I1c4b7377c205da7c898014b8b07fc6dc1d46e4dd
2010-06-30 14:41:59 -07:00
Andreas Huber
8154265bf1 Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread 2010-06-30 11:32:31 -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