53687 Commits

Author SHA1 Message Date
Daniel Sandler
e07141a562 am e89d4b5d: am e0da3f3b: am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
* commit 'e89d4b5d6952031c31f15db95435e7541e5df08c':
  Fix crazy notification panel background.
2011-06-23 07:41:37 -07:00
Scott Main
80a0fa0b69 am fe8e2fb3: am de937ac0: am bb64fa1e: docs: fix a couple typos
* commit 'fe8e2fb32febccc5c88ca4eba089d747755975d4':
  docs: fix a couple typos
2011-06-23 07:41:29 -07:00
Scott Main
b0f0245297 am 35837c32: am 20fe290e: am beeb7762: docs: fix broken link
* commit '35837c3234a2e888d0a1016f71c5b371a7014f4e':
  docs: fix broken link
2011-06-23 07:41:15 -07:00
Robert Greenwalt
33d0de6965 am e813ea5a: am 4906376f: Just a random fix.
* commit 'e813ea5a11db8070d2ca72cab416fa1a8fd3539c':
  Just a random fix.
2011-06-23 07:40:49 -07:00
Shaopeng Jia
e4ae434731 Update CallerInfo to use the geocoder in the updated location.
Change-Id: I9d4507a50ae473964bf2d094b7a1072d79e61e85
2011-06-23 15:54:24 +02:00
Hung-ying Tyan
37a43f304b Merge "Keep the keepalive process going after NAT port is changed." 2011-06-23 04:29:45 -07:00
Hung-ying Tyan
4af085ff26 Execute all the due wakeup events in SipWakeupTimer.
Events are sorted by periods. So events of larger periods may have trigger
time (i.e., when the event should be processed) earlier than the ones of smaller
periods. So need to scan the whole queue looking for due events. The scan takes
O(n) time but we expect the queue size to be small.

Change-Id: I08bd3bd9d4bb8decb78f3c91c943396463ca023a
2011-06-23 19:23:13 +08:00
Hung-ying Tyan
12750701d0 Keep the keepalive process going after NAT port is changed.
This is a regression from the CL that makes the keep-alive process a reusable
component.

Change-Id: I1d580588e9e303c532bf620056fc0fe88a2fdcda
2011-06-23 18:23:09 +08:00
Brian Carlstrom
ac8a1b2198 Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)
Bug: 4599735

Change-Id: Iee38a2e2929c45b6405214c9012819da09b273af
2011-06-23 02:10:23 -07:00
Vikas Arora
2305ac9e4a Add WEBP to the list of Image formats that support Compression.
Note: The integrator of this change to Android internal code-repo will
have to run one extra step 'make update-api' to update 'api/current.txt'
file corresponding to approved API. The AOSP branch didn't have this
file, hence I could not add the same to this change. The updated file
'api/current.txt' has to be submitted along with this change.

Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
2011-06-23 13:11:13 +05:30
Grace Kloba
cf559377b7 Add onSurfaceTextureUpdated to the TextureView listener.
The app needs a way to throttle the producer side. Expose this to enable it.

Change-Id: I04b6a3fc444117a9fc2449fb87c3c834247c8ef1
2011-06-22 23:05:40 -07:00
Jeff Sharkey
ea5f51909b Merge "Enable bandwidth module from stats service." 2011-06-22 22:21:31 -07:00
Adam Powell
7656b21e63 Fix build
Change-Id: Ieb5f82380b6c69791ab7b4dd3e1d76fdb4dd0b74
2011-06-22 21:58:14 -07:00
Jeff Sharkey
0a9ee1272b Enable bandwidth module from stats service.
During systemReady(), tell netd to enable bandwidth tracking module,
which is used to provide detailed stats and controls.

Change-Id: Iecfd8b17a3b90f5a817d731fbe1c71777681ed6e
2011-06-22 21:44:12 -07:00
Adam Powell
e54e39bea9 Merge "Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable" 2011-06-22 21:38:48 -07:00
Hung-ying Tyan
ea380219df Merge "Move the keepalive process to SipSessionImpl and make it reusable." 2011-06-22 21:38:27 -07:00
Adam Powell
fbca76965b Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable
Change-Id: I659201124c4c6730046be55a918c64ca57a9f4db
2011-06-22 21:29:19 -07:00
Adam Powell
d9b0ee029f Merge "Tweak action bar metrics." 2011-06-22 21:14:42 -07:00
Romain Guy
8b4512ef20 Merge "Prevent possible NPE in TextureView" 2011-06-22 21:02:31 -07:00
Romain Guy
1ec3a58bcd Prevent possible NPE in TextureView
Change-Id: I539813d614c7eb1f68dad6b605cbad5b5144c5e9
2011-06-22 21:01:58 -07:00
Romain Guy
c2e0a1f1cd Merge "Add the ability to specify the opacity of a TextureView" 2011-06-22 20:59:46 -07:00
Romain Guy
a9489274d6 Add the ability to specify the opacity of a TextureView
TextureView assumes its content is opaque by default.

Change-Id: Iba873423566a5b67c388081838bd910dceba32ba
2011-06-22 20:58:11 -07:00
Adam Powell
0d5d1b7e8c Tweak action bar metrics.
Free up some more pixels in the action bar and better define how icons
within it resize.

Change-Id: I0768180e595ee7b23190a26607e8989fa1bac38f
2011-06-22 20:41:44 -07:00
Hung-ying Tyan
4a267a9158 Move the keepalive process to SipSessionImpl and make it reusable.
Reuse the new component in the original keepalive process and the NAT port
mapping timeout measurement process.

This is the foundation for fixing the following bug.

Bug: 3464181

Change-Id: If7e951c000503fa64843942ad062c4d853e20c8d
2011-06-23 11:41:37 +08:00
Nick Pelly
b8a8c7a279 resolved conflicts for merge of 6ce70394 to master
Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf
2011-06-22 20:32:36 -07:00
Xia Wang
fdd33e0144 Merge "Fix issues in Opengl Benchmark tests: - fix live wallpaper drawing, bind the global vertex program after it - scale the icons according to render surface in display icons, also add a background for the icon display test case." 2011-06-22 19:34:34 -07:00
Scott Main
d4f9872cb0 am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit 'dc0ae0cb9752c6d6150593da2dccf39abbe6b095':
  docs: add info about manifest attributes that should not change
2011-06-22 18:13:03 -07:00
Jim Miller
71c77aa822 Merge "Update LockScreen layouts to latest UX spec." 2011-06-22 18:10:02 -07:00
Raphael Moll
f9705ef6d3 am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
* commit '2b5f2d01558ba338042f486c754f63873c4061fe':
  Laoutlib_creator: keep original of delegate methods.
2011-06-22 18:05:22 -07:00
Shimeng (Simon) Wang
6ecf3e90f2 Merge "Use local variable instead of webview method." 2011-06-22 17:58:57 -07:00
Scott Main
dc0ae0cb97 am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit '138836adc7e28e66984fdc20d22688d4da561c15':
  docs: add info about manifest attributes that should not change
2011-06-22 17:53:12 -07:00
Scott Main
138836adc7 Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 2011-06-22 17:45:13 -07:00
Raphael Moll
2b5f2d0155 am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
* commit 'e2b41b0d5c8db85a60cd190c7094052db61114b2':
  Laoutlib_creator: keep original of delegate methods.
2011-06-22 17:44:29 -07:00
Shimeng (Simon) Wang
b30381d783 Use local variable instead of webview method.
This removes the thread warning.

Change-Id: Id2eec46fda8413cfaed49d2a97de40491b7496a2
2011-06-22 17:44:27 -07:00
Conley Owens
1c5d9dec7b am 587e9563: am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit '587e9563d61beaaa67090eddd99b737847561eb9':
  Check if we are in daylight time when calculating timezone
2011-06-22 17:37:19 -07:00
Chet Haase
ef716baaa0 Merge "Fix flashing artifacts caused by invalidation bugs" 2011-06-22 17:17:02 -07:00
Romain Guy
5ab03d5fa9 Merge "Fix another memory leak in OpenGLRenderer" 2011-06-22 17:12:14 -07:00
Raphael Moll
e2b41b0d5c Merge "Laoutlib_creator: keep original of delegate methods." 2011-06-22 17:11:27 -07:00
Romain Guy
d586ad9c9f Fix another memory leak in OpenGLRenderer
Change-Id: I23ed56891452a05cf3ca13f6919c4fef90d5ff4e
2011-06-22 17:10:00 -07:00
Jaikumar Ganesh
ae16cd8137 Merge "Get the profile proxies after the BT Service is up." 2011-06-22 17:05:21 -07:00
Jaikumar Ganesh
78ff1a658b Get the profile proxies after the BT Service is up.
Trying to get the profile proxies before service is up will
cause a NPE.

Change-Id: I604041d6823775abbc2fe10794afaac83d6827ce
2011-06-22 16:55:32 -07:00
Gloria Wang
b7e7bdfe78 - Add two sanity checks.
- Remove one unnecessary line.
- Clear the extendedData vector in DecryptHandle.

Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
2011-06-22 16:36:24 -07:00
Robert Greenwalt
50393202f3 Restrict access to protected networks.
Some networks should only be brought up and controlled by system apps.

bug: 4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b
2011-06-22 16:35:12 -07:00
tedbo
4e8a5c922c Add method to create a ParcelSurfaceTexture from android.view.Surface.
Change-Id: I05e343ab7e327478f60322af9373574b70c148f5
2011-06-22 16:18:09 -07:00
Glenn Kasten
028ab996e5 Fix warnings for uninitialized local variables
Change-Id: Ic9b03b0fd215444e76c7b7bebb385f7831c557e0
2011-06-22 16:18:04 -07:00
Romain Guy
ac3e355bc9 Merge changes I00b54796,Iac465b72
* changes:
  Change max heap size to 48MB
  Fix memory leak in OpenGLRenderer.
2011-06-22 16:14:58 -07:00
Romain Guy
83c033de06 Change max heap size to 48MB
Change-Id: I00b547960c07f1cbe753c3a1391fd3840bd70ea3
2011-06-22 16:12:41 -07:00
Jim Miller
08a975ef86 Update LockScreen layouts to latest UX spec.
- better placement and consistent handling of emergency button.
- use new GridLayout for landscape modes.
- add dimensionable parameters for time and status line fonts.
- fix assets and emergencyCallButton resource references when building for tablets.

Change-Id: I5f4c9cfb6a88ce3ccd8ab4fdafede8e6e59f9407
2011-06-22 16:08:09 -07:00
Fabrice Di Meglio
80dc53d652 Fix bug #4813026 resolved direction of view doesn't change after layout direction changes
- reset resolution if setLayoutDirection() is called
- propagate resolution reset to the children if the View is a ViewGroup and direction is inherited

Change-Id: Iab1a75b17426aead7e28caba827614d7cf8e9450
2011-06-22 16:03:04 -07:00
Scott Main
9fc3579cab docs: add info about manifest attributes that should not change
Change-Id: Ia58d855ccaa3348bc0a2f7a4b7847ec115c442e8
2011-06-22 15:57:37 -07:00