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

61465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Taylor
81b10fd74e am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
  Add new secure setting for controlling Messaging notifications
 2011-11-09 14:34:18 +00:00
Kristian Monsen
b69ce80383 Merge "Part of fix for bug 5584571 Add HTTP request header with app name" 2011-11-09 03:35:01 -08:00
Kristian Monsen
008c37d8f4 Part of fix for bug 5584571 Add HTTP request header with app name 
Need the context to get the package name, adding it method here
that can be called from JNI.

Change-Id: I530d81d9d922ea73a3f9d185618a5c4cfde0aca7
 2011-11-09 11:23:35 +00:00
David 'Digit' Turner
423208d688 Merge "NDK: ANativeActivity: Fix documentation for 'clazz' member." 2011-11-09 02:18:02 -08:00
Flavio Lerda
228a1af213 Merge "Adding two tests to ensure formatNumber is working correctly with Polish numbers, both valid and invalid." 2011-11-09 02:13:41 -08:00
Jeff Brown
319369f32f Merge "Fix JavaDoc typos." 2011-11-08 20:41:09 -08:00
Jeff Brown
27720061b0 Merge "Delete dead code." 2011-11-08 20:40:55 -08:00
Jeff Brown
603f97f324 Fix JavaDoc typos. 
Change-Id: Ieabcd5b89c89440f425917319225735445324765
 2011-11-08 20:24:21 -08:00
Jeff Brown
a965f083d0 Delete dead code. 
Change-Id: Ia78e338a363ab82f9c0b45ce324c2a7cfa8d8246
 2011-11-08 20:24:21 -08:00
Fabrice Di Meglio
208d4592f6 Fix potential crash when shaping Hebrew with bold 
- make code more resilient
- make correct initialization of gHebrewRegularTypeface

Change-Id: I97e98d36b830ad35979184c1459e8c8503eb3d28
 2011-11-08 17:13:49 -08:00
Fabrice Di Meglio
4873dc8fba Merge "Fix bug #5559439 Bogus tab title in browser" 2011-11-08 15:57:40 -08:00
Fabrice Di Meglio
5af447366d Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 2011-11-08 15:55:41 -08:00
Andreas Huber
ea427b0c87 resolved conflicts for merge of 26f70db9 to master 
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
 2011-11-08 10:40:20 -08:00
Tom Taylor
1366c756d2 Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 2011-11-08 09:00:22 -08:00
Andreas Huber
26f70db99f Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -08:00
John Reck
e43a7c18ec am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1 
* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
  Remove unnecessary memory allocations
 2011-11-08 16:41:32 +00:00
John Reck
99015a2464 Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08:00
Eric Laurent
2cb5760896 am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1 
* commit 'f3a892ab9347ce733b81ccb4913a91c586f8f367':
  AudioFlinger: mix track only when really ready
 2011-11-08 16:37:11 +00:00
Eric Laurent
f3a892ab93 Merge "AudioFlinger: mix track only when really ready" into ics-mr1 2011-11-08 08:32:57 -08:00
Ed Heyl
ba1f05d4a8 am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" 
* commit '9d6a51623fdabbe993d7b8848794607394ef7cc2':
  Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
 2011-11-08 14:04:18 +00:00
Ed Heyl
9d6a51623f Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" 
This reverts commit ae5839dcad76625313e6736d69eeaf37af435a3f.
 2011-11-08 05:58:37 -08:00
David 'Digit' Turner
dd00e734f3 NDK: ANativeActivity: Fix documentation for 'clazz' member. 
As discussed on the android-ndk forum, it turns out that the
member named 'clazz' is really a global reference to the NativeActivity
instance. As such, it's really a handle to a VM object, not a VM class.

Ideally, we would rename it to 'activity', but this cannot be done
without breaking NDK source compatibility.

Change-Id: I82ca1549b35346a3eacf9e84c4c836387fc883a6
 2011-11-08 14:18:11 +01:00
Narayan Kamath
f537b25a98 am 98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1 
* commit '98f5500c71754dad428e00d569007e0b98dc8aee':
  Fix a bug in the network TTS api.
 2011-11-08 10:13:39 +00:00
Narayan Kamath
98f5500c71 Merge "Fix a bug in the network TTS api." into ics-mr1 2011-11-08 02:09:18 -08:00
Gilles Debunne
c4c13f9704 am 39896f52: Merge "No more context menu in TextView" into ics-mr1 
* commit '39896f52a84947ffc2062a2584033ff749d90534':
  No more context menu in TextView
 2011-11-08 08:53:03 +00:00
Gilles Debunne
39896f52a8 Merge "No more context menu in TextView" into ics-mr1 2011-11-08 00:48:27 -08:00
Chih-Chung Chang
30885bd479 am 713c9a33: Merge "Fix 5509346: Resize the thumbnails if it\'s too large." into ics-mr1 
* commit '713c9a331e226c970af57c59ff17be29b73025c1':
  Fix 5509346: Resize the thumbnails if it's too large.
 2011-11-08 07:04:36 +00:00
James Dong
977442c487 am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 
* commit 'ee7ebb3257d9337627b175835dc3d08f9b8ab339':
  Fix a hang issue where the first frame can be dropped for timelapse video recording.
 2011-11-08 07:00:34 +00:00
Matthew Xie
bfd9783556 am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5':
  Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-08 07:00:33 +00:00
Chih-Chung Chang
713c9a331e Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1 2011-11-07 22:59:55 -08:00
James Dong
ee7ebb3257 Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 2011-11-07 22:57:02 -08:00
Matthew Xie
67f1ceb616 Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-07 22:42:00 -08:00
Mathias Agopian
147b601e99 am 7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 
* commit '7f1c94e198e051bf481fd2d286c7b33d00664f9d':
  Fix rotation displays frame N-1 briefly while rotating
 2011-11-08 05:36:46 +00:00
Mathias Agopian
7f1c94e198 Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 2011-11-07 21:33:53 -08:00
Jeff Brown
082b8007fb Merge "Improve JavaDoc on AtomicFile." 2011-11-07 21:11:36 -08:00
Fabrice Di Meglio
e187a2f55f Fix bug #5559439 Bogus tab title in browser 
- no need to shigt glyph IDs if we are a "common" script
- also code cleaning (suppress dead code)

Change-Id: I17bcf960f925a897a30894a3c581053f7fe5905f
 2011-11-07 19:54:09 -08:00
Daniel Sandler
7bfb5b51de am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 
* commit 'c06669a303f2122a71e83d4813ecf78e6ff2b5a5':
  Fix scaling on notification panel wifi/battery icons.
 2011-11-08 03:50:34 +00:00
Daniel Sandler
c06669a303 Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 2011-11-07 19:47:51 -08:00
Dianne Hackborn
39c0e9f595 am 84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 
* commit '84b02130a9b3327343425cd4edfc1b85f1e9b23d':
  Update perf tests to always run each test in a fresh process.
 2011-11-08 02:51:40 +00:00
Dianne Hackborn
84b02130a9 Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 2011-11-07 18:46:54 -08:00
Jeff Brown
763631cd24 Improve JavaDoc on AtomicFile. 
Change-Id: I042fa533ea5d4adca8ae6d42dbd8de32adb34cea
 2011-11-07 18:03:55 -08:00
Adam Powell
01971d087b am 13194b16: Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1 
* commit '13194b16d071ce70453a49e9462cfbeb7460d633':
  Fix bug 5534414 - Unselected tab states for Holo
 2011-11-08 01:59:52 +00:00
Adam Powell
13194b16d0 Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1 2011-11-07 17:55:17 -08:00
Adam Powell
d1a956b5f9 Fix bug 5534414 - Unselected tab states for Holo 
Sync unselected action bar tab states with UX. Unselected states no
longer have an underline.

Leave TabWidget tabs alone; they still keep the underline for
unselected tabs.

Change-Id: I379b94aeabb9472f3b6c859507faea57f2f9b0b6
 2011-11-07 17:44:22 -08:00
John Reck
aefc28a1b6 Remove unnecessary memory allocations 
Bug: 5581637
 Also delete some dead, unused code

Change-Id: If6efd11f5032141dadbfcd0b3215e89b464e5f35
 2011-11-07 17:42:06 -08:00
John Wang
02c45c7a34 am 2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1 
* commit '2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09':
  Remain in call audio mode while phone is offhook.
 2011-11-08 00:50:36 +00:00
John Wang
2f99bb5e4f Merge "Remain in call audio mode while phone is offhook." into ics-mr1 2011-11-07 16:46:11 -08:00
John Wang
f885e87884 Remain in call audio mode while phone is offhook. 
While offhook, even the call is on hold, setAudioMode() remains in
MODE_IN_CALL (or MODE_IN_COMMUNICATION for SIP) rather than
switching back to NORMAL.

bug:5546901
Change-Id: I0189dc010d1109895cc38e17b1b80418445d514a
 2011-11-07 15:45:18 -08:00
Robert Greenwalt
46bb0a1cf6 am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe 
* commit '2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
  Make upstream tether list threadsafe
 2011-11-07 23:41:20 +00:00
Robert Greenwalt
2d9ccdb4ab am b445362b: Make upstream tether list threadsafe 
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
  Make upstream tether list threadsafe
 2011-11-07 23:36:28 +00:00