121830 Commits

Author SHA1 Message Date
Christopher Tate
1f5ca7fed2 am 7b3cfebc: am f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '7b3cfebce3ab51e96d6c89317ea48b8bce640d9d':
  Cursor leakage due to cancellation signal
2014-01-10 00:07:09 +00:00
Christopher Tate
7b3cfebce3 am f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit 'f1fbe1135a2872a7287f5c06af211cf780f16598':
  Cursor leakage due to cancellation signal
2014-01-09 20:53:45 +00:00
Christopher Tate
f1fbe1135a am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '4ba1bbadb784e365f443b0272b111d384f4f2229':
  Cursor leakage due to cancellation signal
2014-01-09 20:50:22 +00:00
Christopher Tate
4ba1bbadb7 am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d':
  Cursor leakage due to cancellation signal
2014-01-09 12:47:50 -08:00
Christopher Tate
5fbcb13474 am 35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '35b7de4c4562db8af697ad3384c09d2258d183ba':
  Cursor leakage due to cancellation signal
2014-01-09 12:43:39 -08:00
Christopher Tate
35b7de4c45 Merge "Cursor leakage due to cancellation signal" 2014-01-09 20:41:26 +00:00
Ying Wang
ddf89c0cc8 Merge "Include subdirectory Android.mks." 2014-01-09 20:21:14 +00:00
Glenn Kasten
7dd77a875c Merge "Improve error reporting in AudioTrack JNI" 2014-01-09 20:08:25 +00:00
Leon Scroggins III
b311b3424b Merge "Merge AssetStream with AssetStreamAdaptor." 2014-01-09 19:58:33 +00:00
Vinod Krishnan
c6a0a57489 am aef49f9a: Fwk: Adding a micro theme
* commit 'aef49f9a7142892f38c3bb84b5eae3ceb9a96a15':
  Fwk: Adding a micro theme
2014-01-09 19:25:26 +00:00
Vinod Krishnan
aef49f9a71 Fwk: Adding a micro theme
Adding a micro theme affects 3 different GIT repositories:

1. Repository 'device/google/clockwork' - https://ar/398971
This has the overlay for the DeviceDefault for ClockWork

2. Repository 'platform/vendor/google_clockwork' - https://ar/399378
This has the changes to Clockwork Home to use the new micro Theme.

3. Repository 'frameworks/base' - https://ar/398959
This adds the *_micro.xml style/theme files.

Change-Id: Ib1e87953b052a9ec2ff0ea11dd0dfe55317442b4
2014-01-09 11:11:56 -08:00
Ying Wang
c459bfea7e Include subdirectory Android.mks.
Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29
2014-01-09 11:02:03 -08:00
Glenn Kasten
659a9712f2 Improve error reporting in AudioTrack JNI
for android_media_AudioTrack_get_min_buff_size when it
calls AudioTrack::getMinFrameCount.  That AudioTrack API
has been changed recently to guarantee that it will always
return a valid frameCount if the return value == NO_ERROR.

Change-Id: I8f7f850f1c30229ce77a02bdc963634cdbaf3aac
2014-01-09 09:55:54 -08:00
Michael Jurka
8a1b1e6fcd Merge "Fix build" 2014-01-09 12:58:01 +00:00
Martin Kosiba
6c7be83b22 Merge "Fix the build." 2014-01-09 12:36:13 +00:00
Martin Kosiba
4580d9cf1d Fix the build.
Change I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967 broke the build
with a typo.

Change-Id: If8876078c0e1a20ca1034cc5926080e02fead205
2014-01-09 12:33:22 +00:00
Narayan Kamath
61d94e0d99 Merge "Add new Java 7 concurrent APIs." 2014-01-09 12:25:23 +00:00
Michael Jurka
1c228aa47f Fix build 2014-01-09 13:15:37 +01:00
Baligh Uddin
20d9741be2 Merge "Import translations. DO NOT MERGE" 2014-01-09 03:46:45 +00:00
Baligh Uddin
c1062affd2 Merge "Import translations. DO NOT MERGE" 2014-01-09 03:46:39 +00:00
Baligh Uddin
1adf652d45 Merge "Import translations. DO NOT MERGE" 2014-01-09 03:46:35 +00:00
Jeff Brown
7fa44e90ed am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev
* commit 'b6d9eb875a0bf1bb655a90c88457689342eb0991':
  Add flag to force public virtual display to show own content.
2014-01-09 02:14:56 +00:00
Jeff Brown
b6d9eb875a Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 2014-01-09 02:12:59 +00:00
Alan Viverette
c619b6e58b Merge "Add DisplayList bit for projecting onto a contained volume" 2014-01-09 01:35:03 +00:00
Alan Viverette
58f09b3524 Add DisplayList bit for projecting onto a contained volume
Does not handle reordering/translating the projected DisplayList.

Change-Id: I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967
2014-01-08 17:18:19 -08:00
Adam Powell
4be3573c7e Update internal action bar layouts for API change
Change-Id: Icce370388ddd78f1b2e4115c94072c9420896f0b
2014-01-08 17:05:57 -08:00
Michael Wright
1f634d2627 Merge "Fix Rhodi KL file axes" 2014-01-09 00:43:44 +00:00
Adrian Roos
73415b0c75 Merge "Don't show incorrect pattern in stealth mode." 2014-01-08 23:49:11 +00:00
Vinit Deshpande
80a3a364fd Merge "Revert "Revert "Move Wifi services to a new git project""" 2014-01-08 23:47:44 +00:00
Michael Wright
fbefb93f26 Fix Rhodi KL file axes
Change-Id: Ifb779c7730ed4b69325bf57aa7629c663ee4cb5c
2014-01-08 15:40:14 -08:00
Adrian Roos
e2d71e4520 Don't show incorrect pattern in stealth mode.
Prevent the pattern keyguard from displaying an incorrect pattern when it is configured not to display patterns.

Bug: 11112503
Change-Id: I6defdcbea102e4f3e09193d61071cecc59ea3080
2014-01-08 15:38:23 -08:00
David Christie
8e27a8f695 Merge "Document that Handler.postDelayed uses uptimeMillis() based counting. -Make it clear that delay may be longer than requested. -Potentially help developers avoid power bugs (e.g. releasing after delay). Bug: 12015795" 2014-01-08 22:58:08 +00:00
Adam Powell
9e2694b521 Merge "Move ActionMenuView into android.widget and make it public" 2014-01-08 22:44:22 +00:00
Tim Murray
45bd9a03ef Merge "Fix most logging macros for context pointers." 2014-01-08 22:41:29 +00:00
Tim Murray
cbf779e65c Merge "Fix getBytesSize for YUV allocations." 2014-01-08 22:41:21 +00:00
Marco Nelissen
3de2377d7a Merge "sqlite integer fields are long" 2014-01-08 22:22:27 +00:00
RoboErik
2dfae9bea1 Merge "b/12068020 Make kb layouts only unique to vendor/product" 2014-01-08 22:07:14 +00:00
Adam Powell
fa18d182a3 Move ActionMenuView into android.widget and make it public
Expose ActionMenuView as a way for applications to present
ActionBar-style menus in other embedded or repeating contexts.

Change-Id: I54b7ccd9b2116ca68bc72956da9262bca9d5085f
2014-01-08 13:53:30 -08:00
Tim Murray
71a01b8648 Fix most logging macros for context pointers.
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
2014-01-08 13:29:48 -08:00
John Spurlock
fd3c089b1a Merge "Battery meter: remove bolt color compromise & improve pct." 2014-01-08 20:50:34 +00:00
Alan Viverette
25838002c8 Merge "Allow Views to specify a theme override" 2014-01-08 20:40:39 +00:00
John Spurlock
4b786ff4b5 Battery meter: remove bolt color compromise & improve pct.
- Bolt remains opaque (white) below a threshold level, otherwise
   transparent.
 - Draw the entire shape using a path, removing the need for a
   software layer.
 - Use a similar approach to make the percentage text readable,
   but this still requires a software layer (since text is involved).

Bug: 12131168
Change-Id: Ifde5e99121155bf1be171f44b2c80c116b17c9e7
2014-01-08 15:04:50 -05:00
Wink Saville
e72e85f42a am f05ae3fe: am bc0207fd: am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'f05ae3fe0f7b845efc0733e77e7fbd723d6dc5d3':
  telephony: Add same named operator configuration for some operators
2014-01-08 19:40:30 +00:00
Wink Saville
f05ae3fe0f am bc0207fd: am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'bc0207fdbd6cd8b3f250704b07edef07ab376bcb':
  telephony: Add same named operator configuration for some operators
2014-01-08 19:37:30 +00:00
Wink Saville
bc0207fdbd am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '2626d0e18dc9898d70f75540fabc67421f33fab3':
  telephony: Add same named operator configuration for some operators
2014-01-08 19:34:12 +00:00
Wink Saville
2626d0e18d am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
  telephony: Add same named operator configuration for some operators
2014-01-08 11:31:02 -08:00
Wink Saville
ad06883730 am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '76d5cdd820b5d81af8de73180c272d7f8a01caae':
  telephony: Add same named operator configuration for some operators
2014-01-08 11:28:58 -08:00
Wink Saville
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
Mike Lockwood
613b60451d Merge "SettingsProvider: Allow disabling immersive mode confirmation for specific packages" 2014-01-08 18:54:05 +00:00
Mike Lockwood
c02c4a7c5b SettingsProvider: Allow disabling immersive mode confirmation for specific packages
Change-Id: I2fac06cbe3321d7384278d875c91128bcc15d629
2014-01-08 10:48:03 -08:00