Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,586 Commits 3 Branches 0 Tags
bdfb3aada36ce2f429de95cb5cf414a2de3cec50
Commit Graph

58746 Commits

Author SHA1 Message Date
Makoto Onuki
bdfb3aada3 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 
am: 5b9d876ef5

* commit '5b9d876ef5bf4613d9ef89148c1ab021c473c02e':
  ShortcutManaegr: bug fixes

Change-Id: I3823ba8a62a853d0ee49ec7626778b8fa09adbab
 2016-05-04 21:42:26 +00:00
Wale Ogunwale
8fa700675d Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev 
am: 75179ada54

* commit '75179ada546393cb8929ca9703d39e1151d95ed9':
  Make sure to pause activity before stopping

Change-Id: I5020b92b2edbe0ff749d019fbeb81abf2ae49fe9
 2016-05-04 21:42:18 +00:00
Robin Lee
d319d26279 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 
am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f
 2016-05-04 21:41:23 +00:00
Abhijith Shastry
0734be2f3e Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6 
am: c7e32aba8d

* commit 'c7e32aba8d9c24040da00d6ec1e599a14c4c4f8d':
  Update BlockedNumberContract documentation.

Change-Id: I136799fbedecbea19a005fe4d47b2e41be98cffb
 2016-05-04 21:40:04 +00:00
Renat Aksitov
09f9bc73f4 Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91 
am: 032c1a9299

* commit '032c1a92994e251336114c6b600040bf86991772':
  Voice Messaging Intent API.

Change-Id: Iad7c03099fae00d3c1c2bea0f8100608af33851d
 2016-05-04 21:39:47 +00:00
Vladislav Kaznacheev
040646bb08 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 
am: 423c902258

* commit '423c9022582b2ae9397a4fb52b0293b313c785cf':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Ib6c6dc2770ff6332fbcb6285e871db971e54b066
 2016-05-04 21:38:17 +00:00
Makoto Onuki
5b9d876ef5 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 2016-05-04 21:28:17 +00:00
TreeHugger Robot
5f81a3f84c Merge "Make sure to pause activity before stopping" into nyc-dev 2016-05-04 20:28:51 +00:00
Makoto Onuki
8569452603 ShortcutManaegr: bug fixes 
Fixes 28590035
Fixes 28586105

Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5
 2016-05-04 13:00:41 -07:00
Wale Ogunwale
5dc6d6551e Make sure to pause activity before stopping 
In some cases it is possible for activity manager to request
a resumed activity to stop when it's visibility changes. This
is a valid transition, however we need to make sure to pause
the activity on the client side before stopping it so lifecycle
transition works as expected.

Bug: 28574036
Change-Id: I759b38bbd1c9c3bb0475759bcb638d8223fa504d
 2016-05-04 11:46:29 -07:00
Robin Lee
7ec93a1ee2 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Abhijith Shastry
9a2384a7a6 Merge "Update BlockedNumberContract documentation." into nyc-dev 2016-05-04 18:14:38 +00:00
Renat Aksitov
d516e30b91 Merge "Voice Messaging Intent API." into nyc-dev 2016-05-04 18:02:47 +00:00
TreeHugger Robot
221c6e6db7 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev 2016-05-04 17:07:13 +00:00
Tim Volodine
8e11bff55e Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 
am: 42791eca7d

* commit '42791eca7dd70a077bca554b708c65794afdde92':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I88a8fdb21afead0c268754ba2b459eb75a2de90f
 2016-05-04 12:52:16 +00:00
TreeHugger Robot
42791eca7d Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 2016-05-04 12:37:21 +00:00
Tony Mak
aded4dbf5e New settings key and policy transparency for managed profile settings 
am: c820cc5fb1

* commit 'c820cc5fb1eb036e76d60a25f151cbd91485feb3':
  New settings key and policy transparency for managed profile settings

Change-Id: I5e5d30e39e1ba3c25a589fd6123f3a926b5745ba
 2016-05-04 09:47:33 +00:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings 
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
 2016-05-04 09:33:08 +00:00
Keisuke Kuroyanagi
5496ec1875 Merge "Show drag handles after finishing batch edit if needed." into nyc-dev 
am: be1cd9f5ce

* commit 'be1cd9f5ce6eb2bc37b15258c6ab22e2fc5592e1':
  Show drag handles after finishing batch edit if needed.

Change-Id: Ie831efddf37c32c003936d5214d30f7d59878fb8
 2016-05-04 00:30:11 +00:00
Amith Yamasani
ae4ecce1ef Merge "Clear active requests on switching voice interactor" into nyc-dev 
am: ec07352007

* commit 'ec07352007812eeb70c5f47bbac54e9816a30b55':
  Clear active requests on switching voice interactor

Change-Id: Ib9f32bf86c8a3b8da8e796d722ce1843ad775dc4
 2016-05-04 00:30:06 +00:00
Keisuke Kuroyanagi
be1cd9f5ce Merge "Show drag handles after finishing batch edit if needed." into nyc-dev 2016-05-04 00:22:58 +00:00
Abhijith Shastry
1705fc4767 Update BlockedNumberContract documentation. 
For secondary users, a SecurityException is thrown instead of UnsupportedOperationException.

BUG: 28294786
Change-Id: I6402b856eeb02c4c1d940606ae7e69f3ae9cb45d
 2016-05-03 17:18:02 -07:00
TreeHugger Robot
ec07352007 Merge "Clear active requests on switching voice interactor" into nyc-dev 2016-05-04 00:13:30 +00:00
Vladislav Kaznacheev
f67661cc7a Fix ClipData JavaDoc and behavior that contradicts JavaDoc 
1. Expand JavaDoc for ClipData.addItem to clarify how MIME types are affected.
2. Add "text/uri-list" to MIME type list only for non-content URIs (as JavaDoc explicitly says).

Bug: 28564003
Change-Id: I074daf34310323725690a9ba2c7dff0542ed6349
 2016-05-03 16:48:24 -07:00
Amith Yamasani
eeed06c108 Clear active requests on switching voice interactor 
When voice interactor goes null or changes, cancel all existing
active requests and clear them so that they can be re-submitted.

Bug: 28487567
Change-Id: Ibcf024efcc81ff18ef3babfa9a169292207bc816
 2016-05-03 15:07:03 -07:00
Siyamed Sinir
938055b122 Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev 
am: c18009e6dd

* commit 'c18009e6dd32f04fdad7f1b27a0a6b52ee5c875c':
  Revert "Request re-layout after setText if layout width is 0"

Change-Id: I2c0b8b910f5cd5de82f3b6831b9dd9166a280dc1
 2016-05-03 21:32:28 +00:00
Siyamed Sinir
c18009e6dd Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev 2016-05-03 21:22:18 +00:00
Siyamed Sinir
1f575b890e Revert "Request re-layout after setText if layout width is 0" 
This reverts commit 375366cb2d. 

Bug: 28523980
Change-Id: Ib4dd00eabaf7b5630b18373cc1d7bec61c0e155d
 2016-05-03 20:35:35 +00:00
Abodunrinwa Toki
98f91884ff Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev 
am: f62dd564ed

* commit 'f62dd564edfa7f9e02e17e7a2e3107dbc7b4abb0':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I8adae611f525a14dadc2fc0e2c15cc961b61d0cf
 2016-05-03 20:20:05 +00:00
Abodunrinwa Toki
f62dd564ed Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev 2016-05-03 20:13:26 +00:00
Chris Wren
963b1da018 Merge "copy auto-group decisions to updates" into nyc-dev 
am: facdf19313

* commit 'facdf193139ab32582cf642a6648261bd873268a':
  copy auto-group decisions to updates

Change-Id: Iaeb0f80afda4b51633785fe2cad6f870587b4561
 2016-05-03 20:12:49 +00:00
TreeHugger Robot
facdf19313 Merge "copy auto-group decisions to updates" into nyc-dev 2016-05-03 20:08:03 +00:00
Dimitry Ivanov
fde7511918 Merge "Allow apps to load libraries from under /data" into nyc-dev 
am: a31657911c

* commit 'a31657911c96fb735bf4a34610638c9f95e5c99d':
  Allow apps to load libraries from under /data

Change-Id: I2bfbd50d911857825f9b8060a3ebdb335ff7cfad
 2016-05-03 20:05:27 +00:00
Dimitry Ivanov
a31657911c Merge "Allow apps to load libraries from under /data" into nyc-dev 2016-05-03 20:00:39 +00:00
Adam Lesinski
45b8afabc0 Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev 
am: 00194e0f24

* commit '00194e0f2468d3848aee7e65e542bb5224cfd44a':
  BatteryStats: Fix units on battery charge counter

Change-Id: I8f58fc683e0f32fd587c31344f51ad2d311570a3
 2016-05-03 19:55:39 +00:00
Adam Lesinski
00194e0f24 Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev 2016-05-03 19:47:35 +00:00
Vladislav Kaznacheev
0fd5036fec Merge "Fix typos in ClipData JavaDoc" into nyc-dev 
am: 77843a4213

* commit '77843a4213a9ce81e8aa4d6681e3c46350a31335':
  Fix typos in ClipData JavaDoc

Change-Id: I9e679bf99cbb173ed3fde0ac7f1ac46ec91e72a0
 2016-05-03 19:35:32 +00:00
TreeHugger Robot
77843a4213 Merge "Fix typos in ClipData JavaDoc" into nyc-dev 2016-05-03 19:28:32 +00:00
Abodunrinwa Toki
4e7a1208ea Implement alternative ViewGroup.getChildVisibleRect. 
This CL allows getChildVisibleRect to optionally always call the
view's parent. The previous version attempted to optimize the call
by not calling further up the view heirarchy when the rect isn't
visible in the current view.

The call is hidden and the previous behaviour is preserved to limit
the bits of code that this change affects.

Bug: 28514727
Change-Id: I49550ed4082bcbdcfe4643b962b50f3308092525
 2016-05-03 19:41:15 +01:00
Dimitry Ivanov
bf3b5f7a18 Allow apps to load libraries from under /data 
Allow all application classloaders to load native
libraries from anywhere under /data

Bug: http://b/26954419
Change-Id: I8a808bcdf4a00f7d40b513d4e2ca3d1e76c0909f
 2016-05-03 11:34:58 -07:00
Tim Volodine
b90f5389dd [WebView] Update ServiceWorker related documentation. 
Add some clarifying documentation and usage example.

BUG: 28296205
Change-Id: Ib1695822e3d361b17fc4d8a9a3f24a14e34f40ec
 2016-05-03 18:30:01 +00:00
Adam Lesinski
a8018ac47a BatteryStats: Fix units on battery charge counter 
The unit for the battery charge counter is in micro-Ampere-hours, not coulombs.
We store the value as uAh but display it in dumpsys as mAh.

Bug:27174034
Change-Id: Ib5cc1ee1c5c191336a3e1f18dbb12c38e833f8d0
 2016-05-03 10:41:47 -07:00
Vladislav Kaznacheev
7e4669c5a6 Fix typos in ClipData JavaDoc 
Also removed the obsolete text regarding iconic representation
and fixed some whitespace.

Bug: 28536304
Change-Id: I55ca681b86a121018903a41fff228e7c6126c7e7
 2016-05-03 10:09:06 -07:00
Makoto Onuki
96ef96b563 Merge "ShortcutManager: finishing touches" into nyc-dev 
am: 7d164d35a4

* commit '7d164d35a41d2aa351f0a27faf05fc67ba262c07':
  ShortcutManager: finishing touches

Change-Id: I565dace9a52645fab1e1f419b8a9bec3b2b64517
 2016-05-03 16:36:45 +00:00
Makoto Onuki
7d164d35a4 Merge "ShortcutManager: finishing touches" into nyc-dev 2016-05-03 16:27:46 +00:00
Robin Lee
dc67971a99 Add lockdownEnabled parameter to always-on VPN API 
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: Ibfbd43ad09a25f2e38053fcd6306df3711f8bde2
 2016-05-03 13:24:42 +01:00
Keisuke Kuroyanagi
cd425fa2b6 Merge "Adjust touch position for handles using window coordinate." into nyc-dev 
am: f2f8e65f98

* commit 'f2f8e65f986a8ba56b5555ab10a8aef121acf3f9':
  Adjust touch position for handles using window coordinate.

Change-Id: I57350227e425f6fb34643224c8e6b9943677e4ef
 2016-05-03 02:32:48 +00:00
Keisuke Kuroyanagi
f2f8e65f98 Merge "Adjust touch position for handles using window coordinate." into nyc-dev 2016-05-03 02:29:07 +00:00
Svet Ganov
d76b1a5dad Merge "Disable unused features" into nyc-dev 
am: d4d1512b64

* commit 'd4d1512b64df37157f3fa9c205f1dd3738b47e21':
  Disable unused features

Change-Id: Ib4544a538b041e42ec5751f33c6bc90e5195c93b
 2016-05-03 01:40:59 +00:00
Svetoslav Ganov
d4d1512b64 Merge "Disable unused features" into nyc-dev 2016-05-03 01:37:01 +00:00