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
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
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
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
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
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
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
Keisuke Kuroyanagi
990b78d96e
Merge "Adjust touch position for handles using window coordinate." into nyc-dev am: f2f8e65f98 am: cd425fa2b6
...
am: c8196bf536
* commit 'c8196bf5364b7a99379bdb8c5bfebc4b3fa376d9':
Adjust touch position for handles using window coordinate.
Change-Id: I620bcae3dd995465a4485823b60d85e9a15dfcc0
2016-05-03 02:37:09 +00: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
e15ad0a4ef
Merge "Disable unused features" into nyc-dev am: d4d1512b64 am: d76b1a5dad
...
am: fa58b2752a
* commit 'fa58b2752abe8f60391f73da5cca61dffd0208b5':
Disable unused features
Change-Id: I7e5894d96f76e1139b02bb23c168f1f0f7623b14
2016-05-03 01:45:17 +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
Svet Ganov
a7532cfa46
Disable unused features
...
The multi-package APKs feature was not validated and is now disabled.
Also the ephemeral work was postponed which requires disabling of the
ephemeral cookie APIs.
bug:28514747
Change-Id: Iab7f11c503a76bcc414408dfebdf200843db814e
2016-05-02 18:36:13 -07:00
Raph Levien
779869cabf
Merge "Make LocaleList constructor non-nullable" into nyc-dev am: 4d826831b5 am: c29bc443f8
...
am: 16e416ec69
* commit '16e416ec69cb281e669c2f38833de33ebaf22962':
Make LocaleList constructor non-nullable
Change-Id: I4536dacdd94329f2ab8fecef6f5e868d6895b1fd
2016-05-03 00:38:48 +00:00
Raph Levien
16e416ec69
Merge "Make LocaleList constructor non-nullable" into nyc-dev am: 4d826831b5
...
am: c29bc443f8
* commit 'c29bc443f812be1e6dfe2af8bb8d07a5e2a5edc5':
Make LocaleList constructor non-nullable
Change-Id: I2fb105e76c4f90de055b95c528a4fcf8a91ce028
2016-05-03 00:34:47 +00:00
Raph Levien
7828ea36f8
Merge "Make LocaleList constructor non-nullable" into nyc-dev
...
am: 4d826831b5
* commit '4d826831b5a516184e2323ce619b317e658d475a':
Make LocaleList constructor non-nullable
Change-Id: Ib5b68232c0a44a9839c09a42eb79ba260c26dba6
2016-05-03 00:29:02 +00:00
Raph Levien
4d826831b5
Merge "Make LocaleList constructor non-nullable" into nyc-dev
2016-05-03 00:15:24 +00:00
Todd Kennedy
c699a02479
Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc12 am: 09bad50ef4
...
am: fa1f49c504
* commit 'fa1f49c504abe7a7eefe87fac54f775f22e301f4':
use 'int' for min sdk version
Change-Id: I85590aa529cab7765137ee8658d78da5246a844a
2016-05-02 23:46:55 +00:00
Todd Kennedy
fa1f49c504
Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc12
...
am: 09bad50ef4
* commit '09bad50ef43d72b4d2ca05227af0619703e601f6':
use 'int' for min sdk version
Change-Id: Ib4968452de3892d59772d4c7317b67e13b6e9691
2016-05-02 23:40:50 +00:00
Todd Kennedy
8522739ad6
Merge "use \'int\' for min sdk version" into nyc-dev
...
am: 6a3948bc12
* commit '6a3948bc1268f84faac81d65f43670c30f83746a':
use 'int' for min sdk version
Change-Id: Id9aede51d6b87c357cb82242e5fc4980d16679f2
2016-05-02 23:35:26 +00:00
TreeHugger Robot
6a3948bc12
Merge "use 'int' for min sdk version" into nyc-dev
2016-05-02 23:19:44 +00:00
Ben Lin
bc27b3f88b
Merge "Add ability to rename a downloaded file." into nyc-dev am: d88030fe9e am: acb3f6022c
...
am: 98f20f10d1
* commit '98f20f10d1577be7b7f9c94666728c453154b4ea':
Add ability to rename a downloaded file.
Change-Id: I2a5497349b18178517855b28cfd6b909c2bad7f6
2016-05-02 23:15:44 +00:00
Ben Lin
98f20f10d1
Merge "Add ability to rename a downloaded file." into nyc-dev am: d88030fe9e
...
am: acb3f6022c
* commit 'acb3f6022c2b0d356a740cc27c855557d6409bc7':
Add ability to rename a downloaded file.
Change-Id: I0310df2fb65d7b824ef89546c6071773da57e884
2016-05-02 23:09:32 +00:00
Ben Lin
e2b9d90405
Merge "Add ability to rename a downloaded file." into nyc-dev
...
am: d88030fe9e
* commit 'd88030fe9e070a433120ba2bcf442e271c3ce2df':
Add ability to rename a downloaded file.
Change-Id: Id74561ab7dd8efd4dac3a65513dca2fac2e04112
2016-05-02 23:00:43 +00:00
Ben Lin
d88030fe9e
Merge "Add ability to rename a downloaded file." into nyc-dev
2016-05-02 22:54:23 +00:00
Jaewan Kim
45768d4c3f
Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407 am: 550533dc29
...
am: ce85489d4c
* commit 'ce85489d4cf8d879cd91b539bc00806f3de6bbfb':
Fix crash when device doesn't support picture-in-picture
Change-Id: I3ea6bd8c649db86f535026888efdf61a91b012d5
2016-05-02 22:51:27 +00:00
Jaewan Kim
ce85489d4c
Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407
...
am: 550533dc29
* commit '550533dc298afbcfbb5f7ba5b3421145ab34522b':
Fix crash when device doesn't support picture-in-picture
Change-Id: I8f16400db11282e28e4e8935896a90eeed49e2f2
2016-05-02 22:41:18 +00:00
Jaewan Kim
1e28182362
Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev
...
am: bfa0f48407
* commit 'bfa0f48407e70099c2558983b19163c1d92d063b':
Fix crash when device doesn't support picture-in-picture
Change-Id: Icbbe69970e5f43387323b5ed810ebc11b1cf77b1
2016-05-02 22:36:31 +00:00
Jaewan Kim
bfa0f48407
Merge "Fix crash when device doesn't support picture-in-picture" into nyc-dev
2016-05-02 22:27:54 +00:00