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

64246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
88ef0a73fc Merge "Use correct type for hardware call state" 2012-01-11 10:25:23 -08:00
Glenn Kasten
f733831fc7 Merge "Declare IAudioTrack methods in binder opcode order" 2012-01-11 10:23:34 -08:00
Glenn Kasten
ca61ea8499 Merge "Use consistent style of & reference for AutoMutex" 2012-01-11 10:23:04 -08:00
Glenn Kasten
1ea8a35197 Merge "Fix missing tag in mediaserver ServiceManager: log" 2012-01-11 10:22:45 -08:00
Glenn Kasten
482b9c2d34 Merge "AudioFlinger new can't fail" 2012-01-11 10:22:19 -08:00
Glenn Kasten
bb8d6fb4fc Merge "Fix build warning" 2012-01-11 10:01:34 -08:00
Narayan Kamath
81754949e0 Merge "Write unit tests for android.speech.tts." 2012-01-11 03:39:57 -08:00
Steve Block
49a13f0052 Merge "Remove some stale TODOs from the Java Bridge tests" 2012-01-11 03:14:29 -08:00
Steve Block
c93643be42 Remove some stale TODOs from the Java Bridge tests 
These TODOs were related to testing behavior with JavaScript and Java arrays.
This is now tested thoroughly in JavaBridgeArrayTest.java and
JavaBridgeArrayCoercionTest.java.

No functional change.

Change-Id: I5972b929c3e2743c06aff626c983b4b749ea452f
 2012-01-11 11:04:12 +00:00
satok
0b3caa49cf 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
95c22e6e75 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
4ada9c6f3e 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
satok
c36905673a Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard 
Bug: 5806103

Change-Id: I1a83b227498073c47567f73566043c273809adc9
 2012-01-11 17:03:03 +09:00
Roman Nurik
c894fb7e15 Prevent Android Design sidenav links from opening a new window 
Change-Id: I0ec74fb7ae9e348717d0d96603cd03c58c03459d
 2012-01-10 23:59:20 -08:00
Scott Main
837bc7f936 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
25b772f357 am acd152f0: docs: editorial fix to homepage 
* commit 'acd152f0b7f53c7f09986205b60feb3b6597f700':
  docs: editorial fix to homepage
 2012-01-10 21:13:38 -08:00
Scott Main
acd152f0b7 docs: editorial fix to homepage 
Change-Id: Iaebcacb6be770435091de181e8ee3f9c81d58139
 2012-01-10 21:10:08 -08:00
Jeff Sharkey
2cc28deb9e Merge "Move non-monotonic reporting to interface." 2012-01-10 17:41:01 -08:00
Jeff Sharkey
5a7bcf31a4 Move non-monotonic reporting to interface. 
Report non-monotonic NetworkStats through an observer interface
instead of throwing, since those events are still recoverable.

Change-Id: Ic0749f4634b0ac05dbe90e95ca490957ec8b2f23
 2012-01-10 17:24:44 -08:00
Scott Main
c347a9a61e 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
7cffe2c668 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
05fc9f655a Merge "docs: add links to Android Design from dev docs" into ics-mr1 2012-01-10 17:08:19 -08:00
Roman Nurik
1fd8f382f5 am 3d0891d1: am 548972d7: Merge "Android Design" into ics-mr1 
* commit '3d0891d18782451e2b1461b0bd13ff6f28736d69':
  Android Design
 2012-01-10 17:06:59 -08:00
Roman Nurik
3d0891d187 am 548972d7: Merge "Android Design" into ics-mr1 
* commit '548972d798f06c91cb8cba6716952322da97ac21':
  Android Design
 2012-01-10 17:04:05 -08:00
Roman Nurik
548972d798 Merge "Android Design" into ics-mr1 2012-01-10 17:01:45 -08:00
Roman Nurik
7379046690 Android Design 
Change-Id: I2692ca03fc4c0d088aec0588a36739203f4cf2d2
 2012-01-10 16:42:13 -08:00
Ying Wang
044a0b8ae5 Merge "Build all test apks as raw resource in FrameworksCoreTests." 2012-01-10 16:37:43 -08:00
Ying Wang
24162fc52c Build all test apks as raw resource in FrameworksCoreTests. 
Bug: 5848975
Change-Id: I395013ded1c29e0914f72e03d0abd60bb4a7973a
 2012-01-10 15:12:10 -08:00
Scott Main
eb5dacddc4 docs: add links to Android Design from dev docs 
Change-Id: Ib2334be0a05d33008d2e4850547ff1c3b7b16764
 2012-01-10 14:19:19 -08:00
Steve Block
38e90751a2 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:32 -08:00
Scott Main
f6f793c4ac 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
5a3e67c781 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
d1186cd5bb Merge "docs: fix broken links in .jd docs" into ics-mr1 2012-01-10 12:53:42 -08:00
Jim Miller
5437c220e2 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
d3872f5504 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
62fad76895 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
251f048544 am 06e617f5: am 497661d3: Merge "Fixes typo." into ics-mr1 
* commit '06e617f5a6f68ca99118268eb7361bb1e5ade0a5':
  Fixes typo.
 2012-01-09 19:03:07 -08:00
Pin Ting
06e617f5a6 am 497661d3: Merge "Fixes typo." into ics-mr1 
* commit '497661d309ea960aa9723ef4e0d064b56515b566':
  Fixes typo.
 2012-01-09 19:00:16 -08:00
Pin Ting
497661d309 Merge "Fixes typo." into ics-mr1 2012-01-09 18:58:13 -08:00
Romain Guy
10b0684296 Prevent the GC from destroying the underlying native object 
Change-Id: I9aaba5d82828af83dad8e6a270d2ab8c92b42be5
 2012-01-09 18:42:49 -08:00
Jim Miller
a4edd151c5 Fix 4560303: Add setting to lock later when power button pressed 
This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

For the case of a secure device (user has a pin/password/pattern),
this will lock the device immediately or not based on the setting.

For the non-secure case, this always "locks" the device to provide easy
access to the camera while preventing unwanted input.

Change-Id: Ie328485c3f7559e26896d761cbf0e69d3f4df4e2
 2012-01-09 17:30:58 -08:00
Dianne Hackborn
32313b161f 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
d476c8b8a8 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
d3be0a76e4 Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 2012-01-09 16:47:35 -08:00
Elliott Hughes
14f722359c 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
ab6ccca0d3 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
2ddb4c8509 Merge "Fix issue with site-specific display density getting stuck." 2012-01-09 16:02:21 -08:00
Adam Powell
f6a2ae3719 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
Adam Powell
45b075dd5c Fix a bug where window progress bars had the wrong default visibility 
on windows with action bars.

Change-Id: I5509d9a7c5f029b0471bd63e781f4756f5a319bc
 2012-01-09 15:41:40 -08:00
Mangesh Ghiware
6f2db8e755 Fix issue with site-specific display density getting stuck. 
This issue was found while investigating b/5328288.

After navigating to a page that specifies target-densitydpi in the
viewport meta tag, this density value wasn't reset to the default value
for a page that didn't.

Change-Id: I1a66dab769026367224ecf4cc28bc033ee97e475
 2012-01-09 13:53:01 -08:00