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
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
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
Abodunrinwa Toki
0780f3a073
Fix FloatingToolbar popup positioning.
...
The FloatingToolbar popup wrongly assumes that the main content panel
is wider than the overflow panel. In situations where this assumption
fails, the toolbar popup is positioned wrongly within it's container
window and items appear truncated. This CL fixes this issue.
Bug: 28550367
Change-Id: I41669b1deed7dd34f0b2bd060d14452482d3d36c
2016-05-03 16:25:41 +01: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
Selim Cinek
7b6a07253b
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev am: 33f39a96cb am: 93492ed116
...
am: a02ec26052
* commit 'a02ec26052eb71a1bd2596b3ce832da247141393':
Fixed a bug where the image and the text were overlapping
Change-Id: I132dd395177bc13b8f3cc8c83398dd6e58f94d03
2016-05-02 22:51:20 +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
Selim Cinek
a02ec26052
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev am: 33f39a96cb
...
am: 93492ed116
* commit '93492ed116bb5c47da9e8c929c36d5db93eae786':
Fixed a bug where the image and the text were overlapping
Change-Id: Ic2e57c1a14f4463e2527b386c4a0e4359a9c91af
2016-05-02 22:41:14 +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
Selim Cinek
e1e991dd93
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev
...
am: 33f39a96cb
* commit '33f39a96cb40850b645833528d275c455898f4d2':
Fixed a bug where the image and the text were overlapping
Change-Id: I23bbae6c0115326c03171f227c2d4a8217f28ae5
2016-05-02 22:36:27 +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
TreeHugger Robot
33f39a96cb
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev
2016-05-02 22:26:40 +00:00
Jaewan Kim
d98dcab679
Fix crash when device doesn't support picture-in-picture
...
Bug: 28512987
Change-Id: Ic8287d70fed491d7493d443ba7d9633b7d9aaea9
2016-05-03 07:13:28 +09:00
Todd Kennedy
6e2e7f585b
use 'int' for min sdk version
...
per api council
Change-Id: Id3c1191534f61a0d511a6e9932f50ee613830999
2016-05-02 15:07:32 -07:00
Adrian Roos
883416e54f
Merge "Make sure all Notification actions are shown" into nyc-dev am: 9cb7652fb1 am: 798a860efb
...
am: bca6ffddd8
* commit 'bca6ffddd8e9db7f89565a13cc3322e8dbbfdc2a':
Make sure all Notification actions are shown
Change-Id: I221b6755607d55b8e8f2d14ae75017adc08c97cc
2016-05-02 21:32:27 +00:00
Adrian Roos
bca6ffddd8
Merge "Make sure all Notification actions are shown" into nyc-dev am: 9cb7652fb1
...
am: 798a860efb
* commit '798a860efb0c599448483d5a8e6a9429777c5bc5':
Make sure all Notification actions are shown
Change-Id: I094ba82280047da811da0e65e1a2e6d38f88497f
2016-05-02 21:21:47 +00:00
Adrian Roos
d12ceb4d1c
Merge "Make sure all Notification actions are shown" into nyc-dev
...
am: 9cb7652fb1
* commit '9cb7652fb19256fe61d81c7770fe729fc6b67481':
Make sure all Notification actions are shown
Change-Id: I2fd99fc5be798e97b6e8ebc20fe1d2097d2d7c8c
2016-05-02 21:16:07 +00:00
Adrian Roos
9cb7652fb1
Merge "Make sure all Notification actions are shown" into nyc-dev
2016-05-02 21:04:33 +00:00
Selim Cinek
37878683ff
Fixed a bug where the image and the text were overlapping
...
If a notification was updated with an image, the layout could
stay the old one.
Change-Id: Ic012193e79acf14551801e5e2b704ab9519b9c50
Fixes: 28315999
2016-05-02 13:52:29 -07:00
Raph Levien
10ea92aefa
Make LocaleList constructor non-nullable
...
This commit makes the LocaleList constructor require non-null
arguments in all cases, and fixes all uses of LocaleList that could
previously pass a null to use getEmptyLocaleList() instead (which is
preferred anyway becaues it avoids an allocation.
Bug: 28460668
Change-Id: I4b8b3cfa82914412731c2b79003951c46cb2afa1
2016-05-02 12:57:56 -07:00
Wale Ogunwale
8a734880d8
Merge "Dont relaunch activity in fullscreen stack when entering split screen mode" into nyc-dev am: 53482cb6c0 am: 975c75bc92
...
am: 9e29cbdb0b
* commit '9e29cbdb0b6f83dd183ad148b81474f5dce433f0':
Don’t relaunch activity in fullscreen stack when entering split screen mode
Change-Id: Iaf24c64e9e5cec9f02dd10f803c1b6c9c556b4a0
2016-05-02 19:30:32 +00:00
Wale Ogunwale
9e29cbdb0b
Merge "Dont relaunch activity in fullscreen stack when entering split screen mode" into nyc-dev am: 53482cb6c0
...
am: 975c75bc92
* commit '975c75bc92ba89d4f9e3444b91d35b100ee8e2da':
Don’t relaunch activity in fullscreen stack when entering split screen mode
Change-Id: I5fba7ff2ad40e373abd7f036801741a67a111e3e
2016-05-02 19:24:26 +00:00
Wale Ogunwale
8f1aa6c892
Merge "Dont relaunch activity in fullscreen stack when entering split screen mode" into nyc-dev
...
am: 53482cb6c0
* commit '53482cb6c0a4d51de8aab15f22c9490c9169b05c':
Don’t relaunch activity in fullscreen stack when entering split screen mode
Change-Id: I139c1bab1f1719ca98c8272147d84fb0ed71808e
2016-05-02 19:19:55 +00:00
TreeHugger Robot
53482cb6c0
Merge "Don’t relaunch activity in fullscreen stack when entering split screen mode" into nyc-dev
2016-05-02 19:13:45 +00:00
Makoto Onuki
4d36b3a8c5
ShortcutManager: finishing touches
...
- Change back the throttling quota to 10 calls / day
- Foreground apps are no longer throttled, and when an app comes to
foreground the call counter will be reset.
- When the system locale changes, reset throttling for all packages
for all users.
See LocalService.onSystemLocaleChangedNoLock() for how it's performed.
Because the reset must happen before any other apps have a chance to
publish shortcuts, the logic is not straightforward.
- Added an internal API to reset the throttling upon inline-reply
from a notification.
- Stop supporting icons from "content:" URIs
- Improved javadoc on several APIs.
Also internal refactor needed to this:
- ShortcutUser.getAllPackages()/getAllLaunchers() are no longer
accessible to outer code to prevent accidentally adding/removing the
content. Outer code should use forAllPackages() / forAllLaunchers().
Bug 27923857
Change-Id: I002511193d1d33718163bb1dabe77610bde58198
2016-05-02 12:02:19 -07:00