Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,348 Commits 3 Branches 0 Tags
28aec4fdd298ef9a3d9ff745f41ee4c7a63a4bc4
Commit Graph

65734 Commits

Author SHA1 Message Date
Tim Volodine
28aec4fdd2 Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev am: 42791eca7d am: 8e11bff55e 
am: 0685396eac

* commit '0685396eacb24c61c5cff98ac908684715a70fbe':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I0909b84a3e42a054ea9e75d4c0abbebf345d9641
 2016-05-04 13:06:38 +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
0cded9d39c New settings key and policy transparency for managed profile settings am: c820cc5fb1 am: aded4dbf5e 
am: 3c399a6855

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

Change-Id: I943f08261feae6673f48980f7c9ea9c9419c21d7
 2016-05-04 09:58:11 +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
0a9e750483 Merge "Show drag handles after finishing batch edit if needed." into nyc-dev am: be1cd9f5ce am: 5496ec1875 
am: 8615fdf80c

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

Change-Id: I6461dfd0a53a23d54cc2e9cbac7ba429f67d4a2f
 2016-05-04 00:44:30 +00:00
Amith Yamasani
f5b388c1ae Merge "Clear active requests on switching voice interactor" into nyc-dev am: ec07352007 am: ae4ecce1ef 
am: 5e603c6fa0

* commit '5e603c6fa0b250f5eb0212fc78840eaa1d80007d':
  Clear active requests on switching voice interactor

Change-Id: Ied72a73f7c8a54ed20af91fa7e36da7ffe7c2ba2
 2016-05-04 00:44:14 +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
TreeHugger Robot
ec07352007 Merge "Clear active requests on switching voice interactor" into nyc-dev 2016-05-04 00:13:30 +00: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
Winson
8977440c8f Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev am: bd1708a19d am: 221240d75d 
am: 9814d5e68b

* commit '9814d5e68b407330eced28f3775d78733670e0d4':
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.

Change-Id: I84d308bbf3d8cb4656539eaa65b1c7af99fcbed0
 2016-05-03 22:06:06 +00:00
Winson
221240d75d Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev 
am: bd1708a19d

* commit 'bd1708a19da3ae205c4da3f22d0682c9bd1f76fe':
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.

Change-Id: Ib97a145fc6ff4e761a7220979913ed5be9e8fb71
 2016-05-03 22:01:30 +00:00
Winson Chung
bd1708a19d Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev 
* changes:
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.
 2016-05-03 21:57:03 +00:00
Siyamed Sinir
8cd69a4c48 Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6dd am: 553aae2501 
am: 668504731e

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

Change-Id: I9511aced9abc8d8c250959069bfe8a862eb29689
 2016-05-03 21:37:58 +00:00
Siyamed Sinir
668504731e Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6dd 
am: 553aae2501

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

Change-Id: Id9458413f555556fd69071cff51a26dc17bae915
 2016-05-03 21:35:02 +00: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
b970e9bf01 Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed am: a04fe4fc92 
am: 6609b23ae0

* commit '6609b23ae0ce114cd44c4cef1e3c4ebd98bc1623':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I08542776d74a1804e8787458f5f1688fafc34f18
 2016-05-03 20:25:16 +00:00
Abodunrinwa Toki
6609b23ae0 Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed 
am: a04fe4fc92

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

Change-Id: I37c2543c0c53031a779c3cb93668a4e824eb98b6
 2016-05-03 20:22:27 +00:00
Chris Wren
2639b52d1f Merge "copy auto-group decisions to updates" into nyc-dev am: facdf19313 am: 126d28b51c 
am: 6733edfa51

* commit '6733edfa51f8a6169bb02c060a9a9794522bbc06':
  copy auto-group decisions to updates

Change-Id: I614dbcb08afab4dd417ae6bc34f7d95c3d5d31bf
 2016-05-03 20:20:11 +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
Chris Wren
6733edfa51 Merge "copy auto-group decisions to updates" into nyc-dev am: facdf19313 
am: 126d28b51c

* commit '126d28b51c868579ee5eff1d12ddc0962746ca29':
  copy auto-group decisions to updates

Change-Id: Id71b58586780e1076311db2edea57052bacc2a17
 2016-05-03 20:15:37 +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
Dimitry Ivanov
d9fd045ed1 Merge "Allow apps to load libraries from under /data" into nyc-dev am: a31657911c am: fde7511918 
am: d66b0b16fa

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

Change-Id: I577ab4f344c5f20e427eb644bfe0c7de224c54e3
 2016-05-03 20:10:11 +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
a021b1ebfa Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev am: 00194e0f24 am: 45b8afabc0 
am: 2110964764

* commit '211096476447865bc243259b4e3046a766dfe754':
  BatteryStats: Fix units on battery charge counter

Change-Id: Id9117da75a7cdc3b4f9b8285de7db8a81d7cba21
 2016-05-03 20:00:35 +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
6b8b7996ff Merge "Merge "Fix typos in ClipData JavaDoc" into nyc-dev am: 77843a4213 am: 0fd5036fec" into nyc-mr1-dev-plus-aosp 
am: 1adf75e6bb

* commit '1adf75e6bb06255cc565024efc10d96936f03f0d':
  Fix typos in ClipData JavaDoc

Change-Id: I8891f67276fc00339e5e632f6b0b2ae62159b0af
 2016-05-03 19:42:58 +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
Abodunrinwa Toki
752c5d9157 Merge "Fix FloatingToolbar popup positioning." into nyc-dev am: 344d23c0fa am: d162fa3401 
am: de2d9a1dc5

* commit 'de2d9a1dc5b07905740915225a2559a2e1c364d9':
  Fix FloatingToolbar popup positioning.

Change-Id: I957b66612db297b1b069b547a20ca595cf874a8e
 2016-05-03 18:27:20 +00:00
Abodunrinwa Toki
d162fa3401 Merge "Fix FloatingToolbar popup positioning." into nyc-dev 
am: 344d23c0fa

* commit '344d23c0fadd9714453a2bfdebf1d1b304105acf':
  Fix FloatingToolbar popup positioning.

Change-Id: I0ef15668c3c0bf4a064871a631b704456d3b6785
 2016-05-03 18:22:41 +00:00
Abodunrinwa Toki
344d23c0fa Merge "Fix FloatingToolbar popup positioning." into nyc-dev 2016-05-03 18:19:42 +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
Android Build Merger (Role)
020a08610a Merge "Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d am: 2c0af8597d" 2016-05-03 16:46:58 +00:00
Makoto Onuki
d1bc17aacd Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d 
am: 2c0af8597d

* commit '2c0af8597dd3edb155893453dbb03027dc95135e':
  ShortcutManager: finishing touches

Change-Id: Id54d01e50b8120b898263a674b1886e2f5c16ac4
 2016-05-03 16:45:09 +00:00
Makoto Onuki
2c0af8597d Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev 
am: 59cfcb502d

* commit '59cfcb502d0907af2b4645dc79466541378fefb6':
  ShortcutManager: finishing touches

Change-Id: I20552fe48cf9f87787747324c6c8144d9b555318
 2016-05-03 16:39:37 +00:00
Vladislav Kaznacheev
efbebb8c9d Handle drop correctly in BaseIWindow 
Bug: 28475039
Change-Id: I6a30be0f2c5fe694e85681af387abeabacff9fc9
 2016-05-03 09:39:15 -07:00