ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
42,673 Commits 2 Branches 0 Tags 54 MiB
c1cb740868
Commit Graph

42673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
c1cb740868 Merge "Fix missing tag in mediaserver ServiceManager: log" 2012-01-11 10:22:45 -08:00
Glenn Kasten
d72dbd8002 Merge "AudioFlinger new can't fail" 2012-01-11 10:22:19 -08:00
Glenn Kasten
7e8c52d693 Merge "Fix build warning" 2012-01-11 10:01:34 -08:00
Narayan Kamath
5873400ac8 Merge "Write unit tests for android.speech.tts." 2012-01-11 03:39:57 -08:00
Steve Block
eea80b9330 Merge "Remove some stale TODOs from the Java Bridge tests" 2012-01-11 03:14:29 -08:00
satok
e7227cc9be Merge "Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard Bug: 5806103" 2012-01-11 01:52:50 -08:00
Roman Nurik
80136b5a58 am 4ada9c6f: am c894fb7e: Prevent Android Design sidenav links from opening a new window 
* commit '4ada9c6f3e8911d837820c483b588b430b06e6d3':
  Prevent Android Design sidenav links from opening a new window
 2012-01-11 00:24:36 -08:00
Roman Nurik
b7de5dd80b am c894fb7e: Prevent Android Design sidenav links from opening a new window 
* commit 'c894fb7e15f46381fc783da1236b8bbb4a0e33d6':
  Prevent Android Design sidenav links from opening a new window
 2012-01-11 00:21:41 -08:00
Scott Main
4a47cd21d3 am 25b772f3: am acd152f0: docs: editorial fix to homepage 
* commit '25b772f357d79ddf39c69541839465a9fd2cbf39':
  docs: editorial fix to homepage
 2012-01-10 21:16:08 -08:00
Scott Main
d8ec891580 am acd152f0: docs: editorial fix to homepage 
* commit 'acd152f0b7f53c7f09986205b60feb3b6597f700':
  docs: editorial fix to homepage
 2012-01-10 21:13:38 -08:00
Jeff Sharkey
f0c7552b4b Merge "Move non-monotonic reporting to interface." 2012-01-10 17:41:01 -08:00
Scott Main
bbeee598b2 am 7cffe2c6: am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1 
* commit '7cffe2c66815fcd2c5dc4579ed964901bc17b431':
  docs: add links to Android Design from dev docs
 2012-01-10 17:12:25 -08:00
Scott Main
65aba416a7 am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1 
* commit '05fc9f655aaa01cdb38229d1dc6155a341fa316b':
  docs: add links to Android Design from dev docs
 2012-01-10 17:10:28 -08:00
Scott Main
93e7348d94 Merge "docs: add links to Android Design from dev docs" into ics-mr1 2012-01-10 17:08:19 -08:00
Roman Nurik
3726ce85af am 3d0891d1: am 548972d7: Merge "Android Design" into ics-mr1 
* commit '3d0891d18782451e2b1461b0bd13ff6f28736d69':
  Android Design
 2012-01-10 17:06:59 -08:00
Roman Nurik
28288d6535 am 548972d7: Merge "Android Design" into ics-mr1 
* commit '548972d798f06c91cb8cba6716952322da97ac21':
  Android Design
 2012-01-10 17:04:05 -08:00
Roman Nurik
0dc1f704b2 Merge "Android Design" into ics-mr1 2012-01-10 17:01:45 -08:00
Ying Wang
ae36d6f15b Merge "Build all test apks as raw resource in FrameworksCoreTests." 2012-01-10 16:37:43 -08:00
Steve Block
a5288870d4 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:32 -08:00
Scott Main
5b630b8b9a am 5a3e67c7: am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1 
* commit '5a3e67c7811d4a7906548e113561cd1e901de9e2':
  docs: fix broken links in .jd docs
 2012-01-10 12:58:03 -08:00
Scott Main
fca2839770 am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1 
* commit 'd1186cd5bb445e9b0768edf6cb87022865cada55':
  docs: fix broken links in .jd docs
 2012-01-10 12:55:36 -08:00
Scott Main
5fbad363f1 Merge "docs: fix broken links in .jd docs" into ics-mr1 2012-01-10 12:53:42 -08:00
Jim Miller
0b0a5dc8aa am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:34:51 -08:00
Jim Miller
e597102c47 am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit '62fad7689567bed6ec372401c1b171659c28572d':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:30:41 -08:00
Jim Miller
2f6fcb2893 Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 2012-01-10 10:28:21 -08:00
Pin Ting
fc86e54538 am 06e617f5: am 497661d3: Merge "Fixes typo." into ics-mr1 
* commit '06e617f5a6f68ca99118268eb7361bb1e5ade0a5':
  Fixes typo.
 2012-01-09 19:03:07 -08:00
Pin Ting
e846922266 am 497661d3: Merge "Fixes typo." into ics-mr1 
* commit '497661d309ea960aa9723ef4e0d064b56515b566':
  Fixes typo.
 2012-01-09 19:00:16 -08:00
Pin Ting
98f6fa54ac Merge "Fixes typo." into ics-mr1 2012-01-09 18:58:13 -08:00
Dianne Hackborn
9a15c67558 am d476c8b8: am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 
* commit 'd476c8b8a8a6fadea7e72426d3e93c4e6b00e543':
  Unhide Resources APIs for getting resources at specific densities.
 2012-01-09 16:51:52 -08:00
Dianne Hackborn
198d540688 am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 
* commit 'd3be0a76e46584357dbb77fcd200128d0d7dc9a8':
  Unhide Resources APIs for getting resources at specific densities.
 2012-01-09 16:49:02 -08:00
Dianne Hackborn
ee9e2be00e Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 2012-01-09 16:47:35 -08:00
Elliott Hughes
40254b786a am ab6ccca0: am 64140a07: Fix Music import for Turkish locales. 
* commit 'ab6ccca0d3498e0732c82c867fd2867c5d006783':
  Fix Music import for Turkish locales.
 2012-01-09 16:37:38 -08:00
Elliott Hughes
e366055db4 am 64140a07: Fix Music import for Turkish locales. 
* commit '64140a0770f98b56993a96289ec3143e89194265':
  Fix Music import for Turkish locales.
 2012-01-09 16:12:32 -08:00
Mangesh Ghiware
f61b447509 Merge "Fix issue with site-specific display density getting stuck." 2012-01-09 16:02:21 -08:00
Adam Powell
be6b53cd60 Merge "Fix a bug where window progress bars had the wrong default visibility on windows with action bars." 2012-01-09 15:55:55 -08:00
Steve Block
6726347e89 Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE 
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
 2012-01-09 21:36:22 +00:00
Glenn Kasten
375adfb954 Merge "Fix race conditions related to ringer mode" 2012-01-09 12:01:37 -08:00
Glenn Kasten
c1f592659b Merge "By convention const goes before the type specifier" 2012-01-09 11:59:17 -08:00
Fabrice Di Meglio
eca0b5c1a2 Merge "Add textDirection="locale"" 2012-01-09 10:46:03 -08:00
Ben Murdoch
24f0b4e7d0 Merge "Prompt the user to terminate unresponsive pages." 2012-01-09 10:41:45 -08:00
Glenn Kasten
d31358297b Merge "Replace loop by __builtin_ctz" 2012-01-09 10:25:00 -08:00
Glenn Kasten
d6ac7baa10 Merge "Clean up AudioTrack::mActive and stopped()" 2012-01-09 10:24:40 -08:00
Glenn Kasten
4eeef91a5b Merge "suspended() and isSuspended() are const" 2012-01-09 10:24:09 -08:00
Steve Block
b72fc3d9ac Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE" 2012-01-09 10:13:41 -08:00
Steve Block
e6f43ddce7 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
 2012-01-08 13:19:13 +00:00
Wink Saville
50d76ddfb0 Merge "Add use of net.tethering.noprovisioning to fetchDunApn" 2012-01-06 23:43:37 -08:00
The Android Open Source Project
f344925464 am 20090b30: Reconcile with ics-mr1-release 
* commit '20090b30340f9382a2eca6a9bed21117f7a27d7e':
 2012-01-06 18:18:36 -08:00
The Android Open Source Project
82f71fb38b Reconcile with ics-mr1-release 
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
 2012-01-06 18:15:14 -08:00
Marco Nelissen
b9175095e8 Merge "New UX calls for dialogs without titles." 2012-01-06 16:40:02 -08:00
The Android Automerger
5b03a1a835 merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:32:11 -08:00