Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,598 Commits 3 Branches 0 Tags
ee2a6722bb0fcb84edfee0dc45b0edac471ceb40
Commit Graph

240598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yang Ni
ee2a6722bb Merge "Avoid destroying Device separately" am: a314384d 
am: 6cecf0c

* commit '6cecf0c8500083d33b355aa7c901cf1c1eefd39c':
  Avoid destroying Device separately

Change-Id: I77fb87acaaeed9d23d4b8046031735cdbd3be67d
 2016-04-05 01:57:15 +00:00
Yang Ni
6cecf0c850 Merge "Avoid destroying Device separately" 
am: a314384d

* commit 'a314384dc9785f97bf0f3bb9256f6ea2c765930c':
  Avoid destroying Device separately

Change-Id: Ia9b269456b01b9ba1f742c674449392fb6601599
 2016-04-05 01:54:57 +00:00
Yang Ni
a314384dc9 Merge "Avoid destroying Device separately" 2016-04-05 01:49:22 +00:00
Ashutosh Joshi
c478365740 Merge "App upload to Context hub." into nyc-dev 
am: b4cc448

* commit 'b4cc448946b2edb5802f60a3b1f97efbc8dd7ea0':
  App upload to Context hub.

Change-Id: I273a0503e847cd3fc3fadf85f65d5e5518bd1271
 2016-04-05 01:37:49 +00:00
Ashutosh Joshi
b4cc448946 Merge "App upload to Context hub." into nyc-dev 2016-04-05 01:32:59 +00:00
Yang Ni
cb939dc4fc Avoid destroying Device separately 
Bug: 27983025

Device should be destroyed inside the destructor of the associated
Context.

Change-Id: I921a89974e1174f837349a89aef9b03efa4882f5
(cherry picked from commit 4a70df58a3)
 2016-04-04 18:00:03 -07:00
Yang Ni
af2ac8e2bc Merge "Avoid destroying Device separately" into nyc-dev 
am: 1418269

* commit '14182697bbaeee70fd78bd12e8e7d87254415eae':
  Avoid destroying Device separately

Change-Id: Iecd5d3b1288dfab8a3713b8b54180e6e6d0de3d8
 2016-04-05 00:55:37 +00:00
Yang Ni
14182697bb Merge "Avoid destroying Device separately" into nyc-dev 2016-04-05 00:50:42 +00:00
Tomasz Mikolajewski
4301e5c928 Merge "Fix perf tests for cold startup." into nyc-dev 
am: 31da177

* commit '31da1779e70b9a39c16d2bcc2c3cbb34785cb13b':
  Fix perf tests for cold startup.

Change-Id: I677c6b6636442d3f4fd7435de56a1de15e21a65d
 2016-04-05 00:36:20 +00:00
Tomasz Mikolajewski
31da1779e7 Merge "Fix perf tests for cold startup." into nyc-dev 2016-04-05 00:33:03 +00:00
Paul Jensen
89a8cb8d57 Merge "Fix potential ApfFilter bugs by careful ByteBuffer use" into nyc-dev 
am: 10d70bf

* commit '10d70bff61af5b9c88ce2a3124b2ffbc3a3424fb':
  Fix potential ApfFilter bugs by careful ByteBuffer use

Change-Id: Ia2819f1b8fb3e6cd2f728647eba13e978ea30a94
 2016-04-05 00:28:29 +00:00
Paul Jensen
11383af3b8 Merge "Plumb WiFi multicast filter through to ApfFilter" into nyc-dev 
am: 1059494

* commit '10594942c63e5696b45be7bcc12758f46f5d1a19':
  Plumb WiFi multicast filter through to ApfFilter

Change-Id: Ifb48a372d0335f7025be1e7f4004bb0b9cb1fc9d
 2016-04-05 00:28:27 +00:00
Aga Wronska
5bef6f1b1c Merge "Make Metrics.logKeyboardAction() method take @KeyboardAction type instead of KeyEvent" into nyc-dev 
am: ac4c87f

* commit 'ac4c87f5807b2c36caaf32afaf4765fc97bc6922':
  Make Metrics.logKeyboardAction() method take @KeyboardAction type instead of KeyEvent

Change-Id: I9bcbae73b4bc30f45f546a59586cd8a7fd4c1ee5
 2016-04-05 00:28:25 +00:00
Paul Jensen
10d70bff61 Merge "Fix potential ApfFilter bugs by careful ByteBuffer use" into nyc-dev 2016-04-05 00:23:37 +00:00
Paul Jensen
10594942c6 Merge "Plumb WiFi multicast filter through to ApfFilter" into nyc-dev 2016-04-05 00:22:22 +00:00
Aga Wronska
ac4c87f580 Merge "Make Metrics.logKeyboardAction() method take @KeyboardAction type instead of KeyEvent" into nyc-dev 2016-04-05 00:20:53 +00:00
Makoto Onuki
b1ab349c05 Merge "Do not enable binder exception logging." into nyc-dev 
am: eae454b

* commit 'eae454b4fd73ec7b56228030eb953d365d6cacc5':
  Do not enable binder exception logging.

Change-Id: I11bd7694e27174e6886378aba92e3dfb87ee036a
 2016-04-05 00:18:13 +00:00
Yohei Yukawa
acbcf0c687 Merge "Unhide View#dispatch{Start,Finish}TemporaryDetach()" into nyc-dev 
am: 807c3a8

* commit '807c3a828b97e6d619f2dfdfde2f97efc873f6fe':
  Unhide View#dispatch{Start,Finish}TemporaryDetach()

Change-Id: I1e34c5dd1ce5d942def740224df56db35e0c7d95
 2016-04-05 00:13:24 +00:00
Makoto Onuki
eae454b4fd Merge "Do not enable binder exception logging." into nyc-dev 2016-04-05 00:09:47 +00:00
Robert Carr
fb61a491fb Merge "Correct screenshot bounds calculation." into nyc-dev 
am: df9b907

* commit 'df9b907814a924f18c4ab5b13438bd4e093e6cc8':
  Correct screenshot bounds calculation.

Change-Id: Idad0f055cc7fffb90203a6ed09fbcf6dcdbdc3d1
 2016-04-05 00:07:14 +00:00
Yohei Yukawa
807c3a828b Merge "Unhide View#dispatch{Start,Finish}TemporaryDetach()" into nyc-dev 2016-04-05 00:05:09 +00:00
Rob Carr
df9b907814 Merge "Correct screenshot bounds calculation." into nyc-dev 2016-04-05 00:01:00 +00:00
Adrian Roos
7ae2b26d42 Merge "Get rid of negative margins" into nyc-dev 
am: cd2273c

* commit 'cd2273c1d9917aec9c2113335c2cf8f5a25840d8':
  Get rid of negative margins

Change-Id: I789d48f092e04527968cb9144d75b8adcdb936f5
 2016-04-04 23:59:05 +00:00
Adrian Roos
cd2273c1d9 Merge "Get rid of negative margins" into nyc-dev 2016-04-04 23:55:54 +00:00
Ashutosh Joshi
cafdee9a72 App upload to Context hub. 
Fix constants
Use helper functions to address OS

Change-Id: I61bd1f3eff2716ead2771eda335998f2e9b73afc
 2016-04-04 16:50:27 -07:00
Mady Mellor
8df9ad60d0 Merge "Fix slow dismiss animation" into nyc-dev 
am: 5ba429c

* commit '5ba429c40aa4f895f8f5d668f3549d55ee1979f6':
  Fix slow dismiss animation

Change-Id: I51d5a68e3664a7f10aeac7b24bb69f58b0fe319f
 2016-04-04 23:36:07 +00:00
Mady Mellor
5ba429c40a Merge "Fix slow dismiss animation" into nyc-dev 2016-04-04 23:29:07 +00:00
Muyuan Li
daef535295 SettingsLib: refactor for extensibility. 
am: 18d2b32

* commit '18d2b32423855bb9dceb044d87e5d3543c4575a0':
  SettingsLib: refactor for extensibility.

Change-Id: I83e8d3c463350a8ed7ebca9dca2a515020673947
 2016-04-04 23:26:10 +00:00
Mady Mellor
8f20ccc1e2 Merge "Fix showing gear behind notification when RTL language selected" into nyc-dev 
am: e9301ed

* commit 'e9301ed60d3b013e17f157dae6920c414df1e60f':
  Fix showing gear behind notification when RTL language selected

Change-Id: Ifccf08540c79f8a212b9ad24566f762db5710655
 2016-04-04 23:20:43 +00:00
Muyuan Li
18d2b32423 SettingsLib: refactor for extensibility. 
Add short version of charging / discharging labels. Extended getBatteryInfo method to take in additional flag for short version labels.

Change-Id: I499ce59493f1345c3084d48829ded5117d470e44
(cherry picked from commit e686bf4514d9c1116a4eaa8af285f44613e23b36)
 2016-04-04 23:19:29 +00:00
Adam Powell
379dbfe274 Merge "Tweaks for ScaleGestureDetector" into nyc-dev 
am: 13af984

* commit '13af9845d4d6598dd64c4c8c99af93f92e7b56af':
  Tweaks for ScaleGestureDetector

Change-Id: I1bc8c19f1f64b3deda28538dfc81a2ef691ce656
 2016-04-04 23:15:42 +00:00
Mady Mellor
e9301ed60d Merge "Fix showing gear behind notification when RTL language selected" into nyc-dev 2016-04-04 23:14:07 +00:00
Jorim Jaggi
9f7d4f9133 Merge "Fix minimized dock" into nyc-dev 
am: fe3442d

* commit 'fe3442d3668a2a064499410fafe4abec892408eb':
  Fix minimized dock

Change-Id: I2b187fb8c0503c713f2629e075dfef7974a3f656
 2016-04-04 23:10:36 +00:00
Adam Powell
13af9845d4 Merge "Tweaks for ScaleGestureDetector" into nyc-dev 2016-04-04 23:06:00 +00:00
Jorim Jaggi
fe3442d366 Merge "Fix minimized dock" into nyc-dev 2016-04-04 23:05:38 +00:00
Makoto Onuki
e23283a6fa Do not enable binder exception logging. 
Bug 28005618

Change-Id: Ie13fd5b6d1fcbf27ad480501e30b5cb1774e8b48
 2016-04-04 15:58:39 -07:00
Winson
3ffd47009f Merge "Adding content description for app-info button when talkback is enabled." into nyc-dev 
am: 7c8bf0f

* commit '7c8bf0f51e89f551be4219dbde2285c08c7bf7a9':
  Adding content description for app-info button when talkback is enabled.

Change-Id: If49590e63123f65725c37ad98a85de5fe0e8a4f9
 2016-04-04 22:55:04 +00:00
Winson Chung
7c8bf0f51e Merge "Adding content description for app-info button when talkback is enabled." into nyc-dev 2016-04-04 22:50:42 +00:00
Robert Carr
aee0d50e51 Merge "Do not constrain width/height of child windows at layout." into nyc-dev 
am: e15fb01

* commit 'e15fb0172c38a69551aedc43a28a24cd7c9647bf':
  Do not constrain width/height of child windows at layout.

Change-Id: I46b9ba59b89a1fa2ed2bd4d75ac399ff337924e2
 2016-04-04 22:42:21 +00:00
Rob Carr
e15fb0172c Merge "Do not constrain width/height of child windows at layout." into nyc-dev 2016-04-04 22:33:45 +00:00
Robert Carr
bd9993662d Correct screenshot bounds calculation. 
If we intersect each window in the application with
our screenshot bounds we will end up reduced to the bounds
of the smallest window. Modify logic to just check for
intersection without modifying the bounds.

Bug: 27996291
Change-Id: Ib0ebb6bd02a313f67f1562dabcfb394efa8f16cf
 2016-04-04 15:30:31 -07:00
Adam Lesinski
934dfddfd4 Merge "AAPT2: Add option to add JavaDoc annotations to Java classes" into nyc-dev 
am: b12c260

* commit 'b12c2601f475ee127d9ab333e5b8c6cd9a9967e4':
  AAPT2: Add option to add JavaDoc annotations to Java classes

Change-Id: I67b797ff2bdc05ef318796841b545812179a617c
 2016-04-04 22:29:37 +00:00
Roshan Pius
bbc3704933 Merge "power_profile: Move all wifi power values" into nyc-dev 
am: bf8ea13

* commit 'bf8ea13069aec021739b9919a27741f1722466f6':
  power_profile: Move all wifi power values

Change-Id: I31b97ab5150ecb35797f699a7fc53adc8857c039
 2016-04-04 22:29:34 +00:00
Adam Lesinski
b12c2601f4 Merge "AAPT2: Add option to add JavaDoc annotations to Java classes" into nyc-dev 2016-04-04 22:25:56 +00:00
Roshan Pius
bf8ea13069 Merge "power_profile: Move all wifi power values" into nyc-dev 2016-04-04 22:21:25 +00:00
Gustav Sennton
57015b1862 Merge "Provide command to change WebView implementation." into nyc-dev 
am: 3d48074

* commit '3d48074ed910890166b1f35dc3f28e0ac610916f':
  Provide command to change WebView implementation.

Change-Id: I9771561bb13ee0978e5791aa1300746fbe972a11
 2016-04-04 22:14:27 +00:00
Chris Craik
517dad11db Merge "Fix how outlines are sent to rendernode" into nyc-dev 
am: a7f775d

* commit 'a7f775db93235ab25636ab2350ccf6df2729c030':
  Fix how outlines are sent to rendernode

Change-Id: I5ffd4fbd553c3b81aca4290b8c03a9837ac7f31b
 2016-04-04 22:14:25 +00:00
Gustav Sennton
3d48074ed9 Merge "Provide command to change WebView implementation." into nyc-dev 2016-04-04 22:09:36 +00:00
Winson
b92dd63581 Adding content description for app-info button when talkback is enabled. 
Bug: 27699389
Change-Id: Ia4a0e5f197fa5c51585c3cfb9c71aee858836047
 2016-04-04 22:08:50 +00:00
Chris Craik
a7f775db93 Merge "Fix how outlines are sent to rendernode" into nyc-dev 2016-04-04 22:08:32 +00:00