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

146482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
6393196f5d Fix double chin issue, where bottom inset is applied twice. 
This changes how windowOutsetBottom is applied. Instead of being added to
whatever inset is already set, it overwrites it.

Bug: 16567038
Change-Id: Idedae93b790652e9de0519764ea7a03841f9e8fd
 2014-07-25 14:25:16 -07:00
Alan Viverette
6fdac3357e Merge "Add better errors for unresolved attributes, remove unused code" into lmp-dev 2014-07-25 21:16:23 +00:00
Alan Viverette
216d3e6d81 Add better errors for unresolved attributes, remove unused code 
Change-Id: Icf81a81b9ce97b5a5edff85569e6e3da93149436
 2014-07-29 10:35:42 -07:00
Adam Lesinski
ae9e68a349 Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev 2014-07-28 22:45:16 +00:00
John Reck
591a824c5d Merge "Add layer/texture creation tracing" into lmp-dev 2014-07-28 18:28:56 +00:00
John Reck
ec4cefc152 Add layer/texture creation tracing 
Change-Id: I0af6a36c97a9f5f35d28e0e36539ba8d8011ea7c
 2014-07-29 10:04:01 -07:00
Eric Laurent
b5b3a1d30b Merge "Fix capitalization on AudioPort callback method names" into lmp-dev 2014-07-28 22:45:16 +00:00
Eric Laurent
fdaed9dcb6 Fix capitalization on AudioPort callback method names 
Change-Id: I87963ea7290989333781bf8905c9ae640c34d943
 2014-07-29 09:30:34 -07:00
Adam Lesinski
d7a94da476 Have AEP GL feature depend on GLES 3.1 in badging 
AAPT dump badging should output the uses-gl-es tag with
a version of 3.1 when android.hardware.opengles.aep is
declared as a feature.

Change-Id: I8affc6dad574c8303c6ba9810ad8e6e205ea9506
 2014-07-25 22:45:33 +00:00
Robert Ly
9613b433f4 Merge "docs: fix typo" into klp-modular-docs 2014-07-25 21:16:23 +00:00
George Mount
7299bc1305 Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 2014-07-25 21:16:23 +00:00
George Mount
807e40c55c Allow a "ghost view" that paint a different view from the overlay. 
Bug 15744995

The ghost view doesn't route touch events, but hides another
view in its normal parent, and paints it as a child of another
ViewGroup or ViewGroupOverlay.

Change-Id: I352e14c366ccfb7303cee1dbff8563c673fd12ff
 2014-07-29 07:27:52 -07:00
Marcin Kosiba
eed396f792 Make webview text encoding and keySystemUUID mapping and error page public. 
These resources will need to be accessed from the APK-bundled
WebView and therefore need to be made public.

BUG: 11505352
Change-Id: I5e988671cc8342ed4146a90b4de1246460232050
 2014-07-29 15:17:07 +01:00
Ricardo Cervera
6c555824eb docs: Describe the alloc tracker in Android Studio 
Change-Id: Ic3cfc94950029104ec75ab04a9fac51ba64dd9a9
 2014-07-25 08:32:15 -07:00
Craig Mautner
a9c5257a15 am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev 
* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
  Finish crashed activities immediately
 2014-07-25 02:19:53 +00:00
Craig Mautner
a0bb44efe9 Merge "Finish crashed activities immediately" into klp-modular-dev 2014-07-24 20:48:02 +00:00
Craig Mautner
8e5b133bf6 Finish crashed activities immediately 
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.

Fixes bug 15092354.

Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
 2014-07-24 13:32:37 -07:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev 
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
 2014-07-24 18:06:03 +00:00
Lorenzo Colitti
c6acfa29d5 Merge "Use getBoundURL for network validation." into lmp-dev 2014-07-24 16:04:26 +00:00
George Mount
964c3cf5b2 Add default propagation back to Explode. 
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
 2014-07-29 14:13:00 +00:00
Lorenzo Colitti
ae6dffb697 Use getBoundURL for network validation. 
Disable for now, until we're more confident that it doesn't choke
on strange captive portals.

Change-Id: Ic8e66a379d32c915c949df70ca0d38535cd5dbe0
 2014-07-29 13:36:10 +09:00
Jim Miller
73f1856f7f Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev 2014-07-25 21:16:23 +00:00
Jim Miller
604e7558ef Add new DevicePolicyManager API to allow fine-grained TrustAgent management 
This adds a new feature that allows a device admin to specify a
whitelist of features that are allowed for the given admin.

Change-Id: I83f853318efbcf72308532d0a997374f73fa9c10
 2014-07-28 21:32:01 -07:00
John Spurlock
3af1afb069 Merge "Settings: Constants for notification settings." into lmp-dev 2014-07-27 22:35:46 +00:00
Sailesh Nepal
4e7ec71e64 Handle synchronous failed connection 
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
 2014-07-29 01:46:57 +00:00
Filip Gruszczynski
0fa59b898a am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '896a82d77e732c7387b2279bcdd0f04d696b13df':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:08:09 +00:00
Craig Mautner
7544c82997 am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:07:59 +00:00
John Spurlock
2b0e09c59f Settings: Constants for notification settings. 
Bug:16208321
Change-Id: Iaf18dfc2edda9d80553f02ea0a74236230f89079
 2014-07-28 20:43:47 -04:00
John Spurlock
8c01d88208 Zen: follow independent ringer mode changes. 
Bug:16624498
Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
 2014-07-28 20:39:17 -04:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically. 
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
 2014-07-29 00:32:59 +00:00
vandwalle
0ae4e5da22 Merge "fix typo in scanresult" into lmp-dev 2014-07-25 21:16:23 +00:00
vandwalle
ec5a901ea8 fix typo in scanresult 
Change-Id: I4a7998097419bebeb94b23785567865b19205642
 2014-07-28 20:48:33 -07:00
vandwalle
9dddb46f0f Merge "add debug info to wificonfiguration dump" into lmp-dev 2014-07-25 21:16:23 +00:00
vandwalle
16a40cc7b5 add debug info to wificonfiguration dump 
Change-Id: I4887afa21d6e1d9463fa4a5cd0aa7ae22973239f
 2014-07-28 20:35:44 -07:00
John Spurlock
f221b7f45a Merge "Zen: Classify notifications using the alarm stream." into lmp-dev 2014-07-27 22:35:46 +00:00
John Spurlock
bfa5dc4c6c Zen: Classify notifications using the alarm stream. 
Also:
 - include audio attributes in dump
 - workaround for recent AudioAttributes change.

Bug:16455021
Change-Id: Ib9b047a74cff3e0cc354a5aaa96bc92a400b3845
 2014-07-28 23:34:31 -04:00
Sailesh Nepal
ed28d406ee Merge "Fix WTF when creating a lazily initialized connection" into lmp-dev 2014-07-24 16:56:49 +00:00
Sailesh Nepal
b2d41f4c4c Fix WTF when creating a lazily initialized connection 
Change-Id: I16af7e99d07f83b17f111acbf0a3285d09cee13e
 2014-07-28 20:33:07 -07:00
Riley Andrews
4789e41a9f Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation." into lmp-dev 2014-07-24 15:37:54 +00:00
Riley Andrews
68eccdade2 Add cursor flags into SpriteController to suppor async cursor updates. 
- This is fairly blindly taken from nvidia's implementation.

Change-Id: I825ecbd9cb4b394793dce079591b37efca546bbe
 2014-07-28 22:04:06 +00:00
Jing Zhao
03cab4cbe6 Enable config CDMA home system by mcc mnc 
Define CDMA home system IDs for Verizon

Change-Id: Ie10d838173df3095238c50d419bd9de589e34e55
 2014-07-28 21:53:52 +00:00
Winson Chung
b1b191ad66 Merge "Updating lock-to-app look." into lmp-dev 2014-07-25 21:16:23 +00:00
Winson Chung
2915b9d148 Updating lock-to-app look. 
- Adding seek bars for tweaking values when in debug mode

Change-Id: I92ae7b431ee170f5d8b31f34349d51a6b7f9ddef
 2014-07-28 22:26:36 +00:00
Eric Laurent
62dc1768d6 rename AudioSystem::newAudioSessionId() 
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.

Bug: 12378680.

Change-Id: I3f6658db2b8db8f56d1a99f12b15429e293631e6
 2014-07-28 22:21:46 +00:00
Christopher Tate
7f25081a4d Merge "Provide outside-facing API for data management intent+label" into lmp-dev 2014-07-27 22:35:46 +00:00
Christopher Tate
c17739d112 Provide outside-facing API for data management intent+label 
Bug 16346320

Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
 2014-07-28 23:13:06 +00:00
Jinsuk Kim
cfcdf12701 Merge "Add MHL getPortInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
f4eb72d53b Add MHL getPortInfo 
Allows MHL support flag to be put into port information

Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
 2014-07-28 06:57:04 +09:00
Jinsuk Kim
8c688ada2d MHL controller for subcommand reception 
Implement HdmiMhlController command reception part.

Bug: 16215362

Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
 2014-07-26 08:14:08 +09:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay 
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
 2014-07-25 23:01:32 +00:00