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
Craig Mautner
b859449b71
resolved conflicts for merge of 88bfc6dd to master
...
Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515
2014-01-08 09:51:33 -08:00
Baligh Uddin
3104c96ee2
Import translations. DO NOT MERGE
...
Change-Id: I0b5c058dcbb0fd0d8b410cc475c0342ae5477457
Auto-generated-cl: translation import
2014-01-08 09:36:59 -08:00
Craig Mautner
88bfc6ddc8
Merge "Extend stack management to other displays." into klp-modular-dev
2014-01-08 17:33:42 +00:00
Marco Nelissen
8964cbbb50
sqlite integer fields are long
...
Change-Id: I350ccfe91af707cfc234bead9341d68b55623d7b
2014-01-08 17:19:45 +00:00
Mike Lockwood
7b925fbb87
am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
...
* commit '43bc1c07d25b7f278a860bbb9118f46ac732593a':
Added missing USB device descriptor fields needed for intent filters
2014-01-08 16:10:42 +00:00
Mike Lockwood
43bc1c07d2
am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
...
* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
Added missing USB device descriptor fields needed for intent filters
2014-01-08 16:08:17 +00:00
Mike Lockwood
d9e708e365
am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
...
* commit '12ec2e6d71bc69ca11946f7f051931863c934273':
Added missing USB device descriptor fields needed for intent filters
2014-01-08 16:05:29 +00:00
Mike Lockwood
12ec2e6d71
am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
...
* commit '992065938a95e5273b22dea009b8581bcc693e61':
Added missing USB device descriptor fields needed for intent filters
2014-01-08 08:01:42 -08:00
Mike Lockwood
992065938a
am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
...
* commit '9607d78f5144792993bd254a4b5983b2a9d5bf83':
Added missing USB device descriptor fields needed for intent filters
2014-01-08 07:59:06 -08:00
Mike Lockwood
9607d78f51
Merge "Added missing USB device descriptor fields needed for intent filters"
2014-01-08 15:56:13 +00:00
Narayan Kamath
bcf40bcda5
am e853de1f: am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712"
...
* commit 'e853de1f10820da1bc7b6bf13faadaf835239c29':
Fix a bug introduced in change 73712
2014-01-08 13:09:05 +00:00
Narayan Kamath
e853de1f10
am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712"
...
* commit '2d87407e5765228a3469b9681ebff6c0c7eee140':
Fix a bug introduced in change 73712
2014-01-08 13:06:55 +00:00
Narayan Kamath
2d87407e57
am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712"
...
* commit '136c02191790aa937c490341df49e966735f6857':
Fix a bug introduced in change 73712
2014-01-08 13:04:15 +00:00
Narayan Kamath
136c021917
am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712"
...
* commit 'c156021debb8e13324e451cb288da7edd7e112ca':
Fix a bug introduced in change 73712
2014-01-08 05:00:33 -08:00
Narayan Kamath
c156021deb
am 8a927cfa: Merge "Fix a bug introduced in change 73712"
...
* commit '8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
Fix a bug introduced in change 73712
2014-01-08 04:49:24 -08:00
Narayan Kamath
8a927cfa4e
Merge "Fix a bug introduced in change 73712"
2014-01-08 12:47:31 +00:00
Narayan Kamath
0203d58ecf
am db47efd3: am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
...
* commit 'db47efd3f8581c2c0d72a1b8617aeae9830f7ea4':
AArch64: Use long for pointers in App/Backup
2014-01-08 12:38:37 +00:00
Narayan Kamath
ee864c0a04
am 55a12adc: am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers"
...
* commit '55a12adc19b15df4068b90439dccb868534002c7':
AArch64: Use long for pointers
2014-01-08 12:38:30 +00:00
Narayan Kamath
6bbda22e1c
am 29eadb32: am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
...
* commit '29eadb328a71f912b0d479860286cd606ed3dc87':
AArch64: Use long for pointers in hardware classes
2014-01-08 12:38:24 +00:00
Narayan Kamath
2c0971eeec
am 3f7b8d0c: resolved conflicts for merge of 92ae0347 to klp-modular-dev
...
* commit '3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85':
AArch64: Use long for pointers in services
2014-01-08 12:34:29 +00:00