Adam Lesinski
a021b1ebfa
Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev am: 00194e0f24 am: 45b8afabc0
...
am: 2110964764
2016-05-03 20:00:35 +00:00
Adam Lesinski
45b8afabc0
Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev
...
am: 00194e0f24
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
2016-05-03 19:42:58 +00:00
Vladislav Kaznacheev
0fd5036fec
Merge "Fix typos in ClipData JavaDoc" into nyc-dev
...
am: 77843a4213
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
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
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
2016-05-03 16:39:37 +00:00
Makoto Onuki
96ef96b563
Merge "ShortcutManager: finishing touches" into nyc-dev
...
am: 7d164d35a4
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
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
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
2016-05-03 01:45:17 +00:00
Svet Ganov
d76b1a5dad
Merge "Disable unused features" into nyc-dev
...
am: d4d1512b64
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
2016-05-03 00:38:48 +00:00
Raph Levien
16e416ec69
Merge "Make LocaleList constructor non-nullable" into nyc-dev am: 4d826831b5
...
am: c29bc443f8
2016-05-03 00:34:47 +00:00
Raph Levien
7828ea36f8
Merge "Make LocaleList constructor non-nullable" into nyc-dev
...
am: 4d826831b5
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
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
2016-05-02 23:40:50 +00:00
Todd Kennedy
8522739ad6
Merge "use \'int\' for min sdk version" into nyc-dev
...
am: 6a3948bc12
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
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
2016-05-02 23:09:32 +00:00
Ben Lin
e2b9d90405
Merge "Add ability to rename a downloaded file." into nyc-dev
...
am: d88030fe9e
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
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
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
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
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
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
2016-05-02 21:21:47 +00:00
Adrian Roos
d12ceb4d1c
Merge "Make sure all Notification actions are shown" into nyc-dev
...
am: 9cb7652fb1
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
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
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
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
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
Tianjie Xu
4ca5415d01
Merge "Set security update label in framework" into nyc-dev am: 8ebedfd0d9 am: 87a51a7a7f
...
am: a4a0f43b6e
2016-05-02 18:01:42 +00:00
Tianjie Xu
87a51a7a7f
Merge "Set security update label in framework" into nyc-dev
...
am: 8ebedfd0d9
2016-05-02 17:48:14 +00:00
Tianjie Xu
8ebedfd0d9
Merge "Set security update label in framework" into nyc-dev
2016-05-02 17:38:52 +00:00
