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

146442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
1f33d77f04 Rename work icon symbol to match the prefix used for badges. 
Also renames the images for consistency.

Bug: 16369104
Change-Id: I19f97ae22cb2ee4f7db210f083badc1a30520b44
 2014-07-29 15:21:01 +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
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
Filip Gruszczynski
896a82d77e am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-28 23:40:13 +00:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
 2014-07-28 23:28:59 +00:00
Craig Mautner
0fa45d93f7 Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 2014-07-28 22:45:16 +00:00
Craig Mautner
7f13ed37fd Remove PendingActivityLaunches based on stack. 
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.

Fixes bug 16045752.

Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
 2014-07-28 14:00:35 -07:00
Alan Lau
52baf3d096 am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:07:23 +00:00
Alan Lau
d2e1ecb67b am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '40b0d4d7519b6a1999742534513406f94c169f1f':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 19:58:00 +00:00
Alan Lau
18b5f44c5e am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 19:57:55 +00:00
Alan Lau
77d6f36bbc Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7.

Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
 2014-07-28 19:53:51 +00:00
Anish Athalye
a665380b60 am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:53:26 +00:00
Alan Lau
af60e56b39 Revert "DO NOT MERGE Fix extraneous allocation and copying" 
This reverts commit 1a408a344c7921d7c943826bea3ce0cdd822583d.

Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
 2014-07-28 19:51:01 +00:00
Alan Lau
3150372342 am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:10:29 +00:00
Anish Athalye
c51a6e45e8 am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'a28e4764994283c3595dd41f12e425cf7dc0d985':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:10:19 +00:00
Anish Athalye
1a408a344c DO NOT MERGE Fix extraneous allocation and copying 
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit 733b3c0f8b77fefcd234c94170faa4e7bd76074c)
 2014-07-28 19:06:10 +00:00
Anish Athalye
a28e476499 DO NOT MERGE Fix line breaking for clusters in narrow views 
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit 162713dd0b72af79c1b2286985f7e79f043cd915)
 2014-07-28 18:47:40 +00:00
Filip Gruszczynski
d0e0339239 Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 2014-07-27 22:35:46 +00:00
Alan Lau
40b0d4d751 Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Alan Lau
cbeef01cce Revert "DO NOT MERGE Fix line breaking for clusters in narrow views" 
This reverts commit a28e4764994283c3595dd41f12e425cf7dc0d985.

Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0
 2014-07-28 19:52:11 +00:00
Alan Lau
97170e0c48 Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Anish Athalye
0c87dfd25d DO NOT MERGE Implement line breaking using ICU break iterator 
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
(cherry picked from commit f8133ae5896926aaf70f12bc0dd1f36a6704c0f5)
 2014-07-28 18:48:01 +00:00
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
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
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
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