Jorim Jaggi
7441931462
Do not override mColor with default color if none set
...
Bug: 15163105
Change-Id: Ibb9507b24aeaae7a571d42eb411aff25449d48fe
2014-06-10 20:57:21 +02:00
Raph Levien
0627ec08dc
Support fake italics
...
This patch adds fake italics, using essentially the same mechanism as
the fake bold implementation. Also combines fake bold/italic settings
with ones explicitly set in the paint.
Change-Id: Ia7eb3ddc8a6192d191711ba723ffd0d1d9d93f2e
2014-06-10 11:49:44 -07:00
Amit Mahajan
965bba3434
Merge "resolved conflicts for merge of 437a77d4 to master"
2014-06-10 18:38:26 +00:00
Raph Levien
1fc0fa87d4
Support for fake bold in Minikin builds
...
Part of the fix for bug 15436379 Fake bold doesn't fully work (Minikin)
This patch queries the Minikin layout for when fake bold is needed,
and applies that to both shaping and drawing paint.
Also simplifies refcounting (the lifetime of all MinikinFont objects
is subsumed by the enclosing FontCollection).
Note: the fake bold flag set by the user is ignored in this patch.
Fake italics would be possible using the same mechanism, but it's
slightly more complicated (fake and user-set textSkewX values would need
to be combined, and the latter restored after drawing).
Change-Id: Ica2c4604846cbb37e5a783778b18d8993c9d4563
2014-06-10 11:37:55 -07:00
Robert Ly
b1cb5aabeb
am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
...
* commit '748856f2d91bd985af3b0973c4953cfa9a6a95ca':
Add documentation for AndroidKeyStore
2014-06-10 18:35:28 +00:00
Justin Koh
44195b4f90
am 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev
...
* commit '42c53fd64641d3c2974b3b8f25a2c600f4c4dd7d':
Catch OperationUnsupportedException when linkifying using WebView
2014-06-10 18:35:20 +00:00
Justin Koh
7b9fa3bd11
am b7c39cee: Remove WebIconDatabase calls from android.provider.Browser
...
* commit 'b7c39cee9ef3b6c58987128cef77c75cc2eab215':
Remove WebIconDatabase calls from android.provider.Browser
2014-06-10 18:35:15 +00:00
Adrian Roos
88427b0c01
Merge "Fix broken tablet layout of QS on lockscreen" into lmp-preview-dev
2014-06-10 18:32:21 +00:00
Chris Wren
a4ef620326
Only post interrupting notifications to the Heads Up.
...
Pop them out to the shade if they haven't been dismissed.
Centralize bookkeeping into HeadsUpNotificationView.
Bug: 13397541
Change-Id: I350478ed954309773cfdd6970d58b22df6d223bc
2014-06-10 14:25:49 -04:00
destradaa
96a14701c0
IPv6 support for GPS HAL.
...
Change-Id: Iacaf3ab86009975ba07e1a13dbe539cf47c5a6f7
2014-06-10 11:14:31 -07:00
Leon Scroggins III
cdb4a446de
Merge "Fix a memory leak with empty screenshot."
2014-06-10 18:08:45 +00:00
Matthew Williams
7b5c2340ad
am e389d1ea: Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev
...
* commit 'e389d1ea63b0a9caa6d069254ac661ca6420917f':
Remove SyncRequest.setPriority from public API
2014-06-10 18:05:41 +00:00
Baligh Uddin
ad423df32e
am fada3c25: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit 'fada3c25b3e9e7e58b14b42d676220a78264d1d9':
Import translations. DO NOT MERGE
2014-06-10 18:05:36 +00:00
Santos Cordon
2489ac9d24
am 6538ac8c: (-s ours) Merge "Support conference calling. (1/4) [DO NOT MERGE]" into lmp-preview-dev
...
* commit '6538ac8c012a67215ee98208f5a668eeb5b7c483':
Support conference calling. (1/4) [DO NOT MERGE]
2014-06-10 18:05:30 +00:00
Baligh Uddin
ecdb5b2bf8
am 66703cb3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit '66703cb306e154a68bd3ec6b7f15585e7db6b815':
Import translations. DO NOT MERGE
2014-06-10 18:05:23 +00:00
Baligh Uddin
ab82c3b4a9
am eaeb602c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit 'eaeb602cc207b7d56c829d63cb0d951d28650cbd':
Import translations. DO NOT MERGE
2014-06-10 18:05:18 +00:00
Adam Connors
39f1311ce1
am 2e98c52d: (-s ours) DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
...
* commit '2e98c52d0b2f4722a237933c69f3ba38314479f4':
DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
2014-06-10 18:05:07 +00:00
Adam Connors
9d4f771ac1
am c8d4c310: (-s ours) DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
...
* commit 'c8d4c3109a946fe3d4cf48ec7b14950b37abd669':
DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
2014-06-10 18:05:01 +00:00
Alan Viverette
a4eab42fe4
Change ripple tint to color, remove tintMode
...
Also fixes double ripple on list preferences, missing ripple on up
button, and adds the Toolbar style to public. Further improves
ripple performance.
BUG: 15523923
BUG: 15473856
Change-Id: I5e8bf417368b60fcc33c80852e12f27b8c580774
2014-06-10 11:00:25 -07:00
Amit Mahajan
0409e9f0af
resolved conflicts for merge of 437a77d4 to master
...
Change-Id: I65585939a57c561064d370be131c0197de0f08c3
2014-06-10 10:47:26 -07:00
Adrian Roos
13dee43e6f
Fix broken tablet layout of QS on lockscreen
...
Bug: 15536406
Change-Id: I6c075d0875cf78dff1938b5cfd49e6b1924bcc99
2014-06-10 19:43:13 +02:00
Doug Zongker
40e53cdc94
Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev
2014-06-10 17:38:20 +00:00
Selim Cinek
554f5406f3
Merge "Fixed several bugs with redaction." into lmp-preview-dev
2014-06-10 17:33:44 +00:00
Selim Cinek
429b1ab5cb
Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev
2014-06-10 17:33:21 +00:00
Jorim Jaggi
36b15237a6
Fix black background for auto-redacted legacy notifications
...
Also removes the wrongly implemented Froyo compatibility mode, as now
all the notifications are light and the background is provided by us,
it's again like in Froyo-world! :-)
Bug: 15295371
Bug: 14105711
Change-Id: Icbae15e690494465b0e63935d81d59edfa05e76e
2014-06-10 19:24:42 +02:00
Chris Craik
1e5cf9aced
am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-dev
...
* commit 'b1c76a1abcfb2f33e12fef37ec71d20724863b5e':
Tessellate on worker threads
2014-06-10 17:22:31 +00:00
Igor Murashkin
f1d758867a
am 69729adf: Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev
...
* commit '69729adf04bddb2e5b67d625412151b4bcbc1ca4':
camera2: Fix session-related CTS test failures
2014-06-10 17:22:22 +00:00
Adam Lesinski
859cd926fe
am a277deb7: (-s ours) DO NOT MERGE - Creating an empty package should be succesfull
...
* commit 'a277deb755f95ca42e39f8910d958bfd1ceafa55':
DO NOT MERGE - Creating an empty package should be succesfull
2014-06-10 17:22:12 +00:00
Jeff Brown
085a1e7933
am af0c2ebf: @hide ACCESS_INPUT_FLINGER permission.
...
* commit 'af0c2ebfc71f6106656eb17345e122ea7ac8cf2a':
@hide ACCESS_INPUT_FLINGER permission.
2014-06-10 17:21:59 +00:00
Craig Mautner
7683baad6c
am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev
...
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
2014-06-10 17:21:52 +00:00
Christopher Tate
4a1c0bd20b
am 2099866f: Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev
...
* commit '2099866f0d9ae5692e6edfc053aebe7f93a21618':
Switch framework to using new scheduled-work API
2014-06-10 17:21:47 +00:00
Fabrice Di Meglio
5ef6f9078a
am 821c8331: Merge "Fix bug #14258811 Permissions icons are not visible in App info" into lmp-preview-dev
...
* commit '821c833143d396cf64536eb4938c0d79d1adccc6':
Fix bug #14258811 Permissions icons are not visible in App info
2014-06-10 17:21:42 +00:00
Leon Scroggins III
e3f9800f38
Fix a memory leak with empty screenshot.
...
Use an autodeleter to delete the ScreenshotClient when it's not
needed.
Discovered while investigating BUG:15454296, but it does not fix
the problem.
Change-Id: I00ea81de15ddc2507d904a6c20af3c410f573dce
2014-06-10 13:19:35 -04:00
Nicolas Prevot
fb8a98d3f3
Changing the value of the user consent extra in DevicePolicyManager.
...
Renaming android.app.action.USER_HAS_CONSENTED to
android.app.action.ACTION_PROVISIONING_USER_HAS_CONSENTED
Change-Id: I65a3b8f1ec29a0bed5b61ff9e7587195e1c96cec
2014-06-10 17:59:27 +01:00
Jessica Hummel
096fc544af
Merge "Add different resolutions of afw icons" into lmp-preview-dev
2014-06-10 16:56:41 +00:00
Jessica Hummel
ae87d9eede
Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev
2014-06-10 16:56:27 +00:00
Selim Cinek
295609a9a5
Merge "Delayed the highlighting of the statusbar header on drag down." into lmp-preview-dev
2014-06-10 16:44:39 +00:00
Selim Cinek
32b5f7a0e8
Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev
2014-06-10 16:41:02 +00:00
Jessica Hummel
b19fd00c51
Add different resolutions of afw icons
...
Also update the name of the icon so that it is consistent with other namings in the framework and in managed provisioning.
bug: 15538051
Change-Id: I9e8e680eb1c654d9f5d94ce27775687b3dc92a22
2014-06-10 16:14:58 +00:00
Nicolas Prevot
e4e95a0a3b
Updating the pictures and labels for cross-profile intents.
...
bug:15538051
Change-Id: Ib95e36acd31d08fed04927be90e8322e806286ab
(cherry picked from commit c4752a313e137630a8cb84581767bb96d3010376)
2014-06-10 16:13:59 +00:00
Yohei Yukawa
1ee99c4627
Show IME-related system IME dialogs over windows owned by the IME
...
The IME-related system dialogs should be placed over any window
owned by the current IME. However, the framework has taken only
the main window of the current IME has been taken into account.
As a result, the system has not been able to show its IME-related
dialog properly layer when the IME is showing its own dialog.
This CL addresses the above issue.
BUG: 5809660
Change-Id: I205321c7ed42516f36a4bf29dd6a159ac34fd5ec
2014-06-11 00:50:29 +09:00
Matthew Williams
c2c1a39510
Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev
2014-06-10 15:50:11 +00:00
Adrian Roos
178e2b98c1
Merge "Add Emergency Calls Only and Charging State to Status Bar Header"
2014-06-10 15:41:15 +00:00
Selim Cinek
2f0df8ae03
Fixed several bugs with redaction.
...
The Notification row was in most cases directly referring to
the private layout which lead to numerous bugs.
Bug: 15107339
Bug: 15536865
Bug: 15181880
Change-Id: Id1021eb853d67db168c9471d7dacbe5265c4ba2f
2014-06-10 17:40:42 +02:00
Baligh Uddin
6af88cc76f
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:37:56 +00:00
Baligh Uddin
2ad173d891
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:37:54 +00:00
Santos Cordon
ece0270d99
Merge "Support conference calling. (1/4) [DO NOT MERGE]" into lmp-preview-dev
2014-06-10 15:34:30 +00:00
Baligh Uddin
342c0d0a94
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:29:10 +00:00
Baligh Uddin
c60aa41104
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:30 +00:00
Baligh Uddin
6584375afd
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:28:25 +00:00