Sreeram Ramachandran
cc91c7b804
Add a new IpPrefix class and use it in RouteInfo.
...
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.
Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.
Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
2014-06-10 14:30:15 -07:00
Christopher Tate
e9ed3707b2
Merge "Out with the old; in with the new" into lmp-preview-dev
2014-06-10 21:27:54 +00:00
Calin Juravle
16719591f4
Merge "Shrink profiler.start-immediately to fit in the maximum property size"
2014-06-10 21:26:11 +00:00
Calin Juravle
994cd28e72
Shrink profiler.start-immediately to fit in the maximum property size
...
Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
2014-06-11 18:21:41 +01:00
Jose Lima
583b6f782c
Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev
2014-06-10 21:25:11 +00:00
John Spurlock
6ab89e28cd
Merge "Saver: Shared resource update and new settings." into lmp-preview-dev
2014-06-10 21:22:41 +00:00
Jorim Jaggi
ce3d6c4c02
Merge "DO NOT MERGE: Fix paddings for user switch and status bar icons." into lmp-preview-dev
2014-06-10 21:21:32 +00:00
Adrian Roos
2643de55d3
Merge "Update security method after switching user"
2014-06-10 21:21:32 +00:00
Jorim Jaggi
a5c1506313
am dc61882e: Merge "Fix black background for auto-redacted legacy notifications" into lmp-preview-dev
...
* commit 'dc61882ef03a25f7861aff838577ef124a8f40e7':
Fix black background for auto-redacted legacy notifications
2014-06-11 11:25:07 +00:00
Adrian Roos
1ab15ca80b
am c77c504e: Merge "Fix broken tablet layout of QS on lockscreen" into lmp-preview-dev
...
* commit 'c77c504ed7a155a80291f8b54c8e3db6f5303d30':
Fix broken tablet layout of QS on lockscreen
2014-06-11 11:25:00 +00:00
Doug Zongker
f27c27c20c
am 68adbeb1: (-s ours) Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev
...
* commit '68adbeb1348501dfd7677bf6c04e317127f5f851':
hide RECOVERY permission from L preview -- DO NOT MERGE
2014-06-11 11:24:54 +00:00
Selim Cinek
1352ef562f
am 02f94e07: Merge "Fixed several bugs with redaction." into lmp-preview-dev
...
* commit '02f94e073838c4b58b01d4dbba7b8f60ce01b49c':
Fixed several bugs with redaction.
2014-06-11 11:24:49 +00:00
Selim Cinek
9e5ed535a4
am 0f700f8c: Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev
...
* commit '0f700f8c65979609242d3a18db412a0ce561eccb':
Fixed an issue where holes in the notification shade could appear.
2014-06-11 11:24:44 +00:00
Nicolas Prevot
0cc9c1e9d3
Merge "Changing the value of the user consent extra in DevicePolicyManager."
2014-06-10 21:31:35 +00:00
Jessica Hummel
fe1de89fe9
am 3d5066de: Merge "Add different resolutions of afw icons" into lmp-preview-dev
...
* commit '3d5066de154193cc3a08a7be168aa5e31bfe0359':
Add different resolutions of afw icons
2014-06-11 09:55:17 +00:00
Jessica Hummel
9c9fc7e536
am f65d5b41: Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev
...
* commit 'f65d5b41bb382a93be752076a2c0d8bd8a2cb012':
Updating the pictures and labels for cross-profile intents.
2014-06-11 09:55:11 +00:00
Selim Cinek
45f904a529
resolved conflicts for merge of b38fd3d4 to master
...
Change-Id: Iaa87cdad76e1fa08d93185fd537f3d2783346c8e
2014-06-11 11:45:24 +02:00
Selim Cinek
bbd2909d52
Merge "Fixed a racecondition which could lead to invisible backgrounds" into lmp-preview-dev
2014-06-10 21:18:16 +00:00
Selim Cinek
a32ab60bb0
Fixed a racecondition which could lead to invisible backgrounds
...
Notification backgrounds could become invisible when doubletapping
a permanent notification.
Bug: 15545215
Change-Id: I799439a368701042b39ca47bcac6fcce281349a7
2014-06-11 15:46:59 +02:00
Calin Juravle
2f84b69bf5
Merge "Improved profile.start-immediately comment"
2014-06-10 21:16:15 +00:00
Jonathan Dixon
3a5cf3876c
Add WebChromeClient.showFileChooser
...
Bug: 6930981
This replaces the never-published openFileChooser, and is more future
extensible.
Currently hidden; will unhide once working end to end and tested.
Change-Id: Ie66750be37e5b90e4a411cec76278369dc8dabe8
2014-06-10 13:58:07 -07:00
Jose Lima
5517ea78eb
Make convertToTranslucent a public method in Activity
...
- Changed the access level for convertToTranslucent in Activity
to public.
- Still keeping convertToTranslucent as a hidden method.
Bug: 15492979
Change-Id: I7d013541e8ed7708ce208cd4cf5d1c1d20d50e50
2014-06-10 13:40:09 -07:00
Adrian Roos
c42d33004d
Update security method after switching user
...
Bug: 15445037
Change-Id: If296dd3ab6510c335aba7ffdce5cdd923ceada6b
2014-06-10 22:39:15 +02:00
Jorim Jaggi
80f5e3c08d
DO NOT MERGE: Fix paddings for user switch and status bar icons.
...
Paddings approved by allysont@ for preview build.
Bug: 15540707
Change-Id: If7288d032b9625e0fbb5b657afcf680d178e63ee
2014-06-10 20:31:58 +00:00
Craig Mautner
e6d80f4ce4
Add NO_ANIMATION flag to ActivityView Intents.
...
Add Intent.FLAG_ACTIVITY_NO_AMINATION to all Intents passed into
ActivityView.
Fixes bug 15393526.
Change-Id: I1899a5019416109e982f0254aaba410bb1f4a38d
2014-06-10 13:31:02 -07:00
Alan Viverette
eb29d330c3
Merge "Change ripple tint to color, remove tintMode" into lmp-preview-dev
2014-06-10 20:14:30 +00:00
Jorim Jaggi
598622df8c
Merge "Do not override mColor with default color if none set" into lmp-preview-dev
2014-06-10 20:03:23 +00:00
Winson Chung
b13c46e8b7
Updating Recents to make the cards slightly more visible.
...
Change-Id: I876d39f4aac4007a3fe0c509ccb7db130f27a737
2014-06-10 12:56:24 -07:00
Christopher Tate
7060b04f6d
Out with the old; in with the new
...
Switch to the official "JobScheduler" etc naming.
Bug 14997851
Change-Id: I73a61aaa9af0740c114d08188bd97c52f3ac86b7
2014-06-10 12:51:55 -07:00
Ruben Brunk
d8c21e8bd0
DO NOT MERGE: camera2: Disallow shim usage for preview.
...
Bug: 15515564
Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710
2014-06-10 19:45:43 +00:00
Jean-Michel Trivi
8a21f5dd79
AudioManager: add ability to allocate a new session ID
...
Expose method to allocate a new session ID.
Make the generic error code public.
Change-Id: Iec93548292845e3a1b1a97be9bbe54e9fcf06f2d
2014-06-10 12:44:04 -07:00
destradaa
54f6e80d32
Merge "IPv6 support for GPS HAL."
2014-06-10 19:42:04 +00:00
John Spurlock
f8f524c80c
Saver: Shared resource update and new settings.
...
Bug:13329308
Change-Id: I9e38f69273a361a8dbd2cdb2385788bd0cdcde38
2014-06-10 15:37:47 -04:00
Raph Levien
cc8f7ae682
Merge "Support fake italics"
2014-06-10 19:05:29 +00:00
Raph Levien
a7be5dd006
Merge "Support for fake bold in Minikin builds"
2014-06-10 19:05:20 +00:00
Jorim Jaggi
6d7a25f317
Merge "Fix black background for auto-redacted legacy notifications" into lmp-preview-dev
2014-06-10 19:01:32 +00:00
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