Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,736 Commits 3 Branches 0 Tags
d1bc17aacd2fcf45a67cf35adf78eca5c2bd708e
Commit Graph

6244 Commits

Author SHA1 Message Date
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
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
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
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
Adam Lesinski
6d21e461e3 Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev am: 4f928358d2 am: 6226d0a364 
am: 40e1ef4b0c

* commit '40e1ef4b0cb9b7b8855a64dda18985362a9d1c0d':
  BatteryStats: Reset per-User Bluetooth and Modem controller activity

Change-Id: I38e839c1f6d0bc2c692bba5327fa70711b9fc1dc
 2016-04-30 03:35:01 +00:00
Adam Lesinski
6226d0a364 Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev 
am: 4f928358d2

* commit '4f928358d2a4023dc6ba5a0bbdb1a63a3e1bfa7a':
  BatteryStats: Reset per-User Bluetooth and Modem controller activity

Change-Id: I08146a8a389a753db8eb7f2d925b7f2e986f3b0e
 2016-04-30 03:30:30 +00:00
TreeHugger Robot
4f928358d2 Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev 2016-04-30 03:26:38 +00:00
Adam Lesinski
28468efe50 Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd am: 132d565eac 
am: 3bd94c3e8a

* commit '3bd94c3e8a34ad328125783973e5d523eb36f000':
  BatteryStats: Keep track of coulomb counter

Change-Id: I3c0bc2e5ddd001a57978fe58f7d4bd511e8a8499
 2016-04-30 02:31:26 +00:00
Adam Lesinski
3bd94c3e8a Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd 
am: 132d565eac

* commit '132d565eacfbf287e4803051b28a0156b996f83f':
  BatteryStats: Keep track of coulomb counter

Change-Id: I0b2e127b0b551080ce33794fab09ba4b8a94688e
 2016-04-30 02:29:20 +00:00
Adam Lesinski
8fec99caae Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev 
am: 3cb7f6bdcd

* commit '3cb7f6bdcda2697eff10853360396d8635d66120':
  BatteryStats: Keep track of coulomb counter

Change-Id: Ica6666696324ab731324692538b1bb3dfc300d92
 2016-04-30 02:27:08 +00:00
TreeHugger Robot
3cb7f6bdcd Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev 2016-04-30 02:21:38 +00:00
Adam Lesinski
1a2b39e61c BatteryStats: Reset per-User Bluetooth and Modem controller activity 
Bug:28469956
Change-Id: I4db68ecc5b7bde8dd552caadee489b7bad3d6cbc
 2016-04-29 17:56:58 -07:00
Adam Lesinski
926969b411 BatteryStats: Keep track of coulomb counter 
Bug:27174034
Change-Id: Ica66817faa20b9788536f28f0e593483f033904b
 2016-04-29 17:40:11 -07:00
TreeHugger Robot
bbb9b80a92 Merge "Grab a window with mouse click and move (no long tap)." 2016-04-29 22:20:49 +00:00
Clara Bayarri
138d324951 Add Tron logging for open/close App Disambig 
This change adds
- Open/close the disambig shade with a featured app
- Open/close the disambig shade with no featured app
- User selected "Always" for the featured app
- User selected "Just Once" for the featured app
- User chose a non-featured app

Bug: 26108706
Change-Id: I4d2c99cee1a784aa1cab156939c57c83d35a4aa5
 2016-04-29 17:28:04 +01:00
Abodunrinwa Toki
1aecebf2bf Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev am: d971a9d5f2 am: c2cd9cca86 
am: 8523c5983d

* commit '8523c5983dfb21cd4bdce94a90112a0090a1db54':
  Ensure FloatingToolbar is not rendered at negative x, y coordinates.

Change-Id: I1b5ecf758781ff32c269c8536791b78d23337f8a
 2016-04-29 14:14:24 +00:00
Abodunrinwa Toki
8523c5983d Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev am: d971a9d5f2 
am: c2cd9cca86

* commit 'c2cd9cca86c190994fd1c898e4bd57acd260eea5':
  Ensure FloatingToolbar is not rendered at negative x, y coordinates.

Change-Id: Iea6fb1f86e62d68dd16adaa9eb83a95ac4856b4e
 2016-04-29 14:11:42 +00:00
Abodunrinwa Toki
81abb66703 Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev 
am: d971a9d5f2

* commit 'd971a9d5f2f945d89728af7fffe1e692c1c91e3b':
  Ensure FloatingToolbar is not rendered at negative x, y coordinates.

Change-Id: Id07efe487b3fe01d9df7968afb66ec4b45ae2c6c
 2016-04-29 14:09:09 +00:00
Abodunrinwa Toki
d971a9d5f2 Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev 2016-04-29 14:04:06 +00:00
Justin Klaassen
5daaed3713 Merge "Support view transformations when positioning floating CAB" into nyc-dev am: 1fe7ed557d am: 5efc1443be 
am: bc2bea558a

* commit 'bc2bea558a83066977bd6dcbac76fe824af73e3b':
  Support view transformations when positioning floating CAB

Change-Id: I749e0ad70054711e81417f48520e8c722d926633
 2016-04-28 20:59:46 +00:00
Justin Klaassen
5efc1443be Merge "Support view transformations when positioning floating CAB" into nyc-dev 
am: 1fe7ed557d

* commit '1fe7ed557de90c6992f6d36a485cd63b651a51dd':
  Support view transformations when positioning floating CAB

Change-Id: I988f50bfedf7c8a0de20eac2e50cf26e6ee422ea
 2016-04-28 20:53:12 +00:00
Justin Klaassen
1fe7ed557d Merge "Support view transformations when positioning floating CAB" into nyc-dev 2016-04-28 20:49:37 +00:00
Joe LaPenna
68bc1cc30c Merge "Allow "disk reads" to sysfs in battery stats" 2016-04-28 20:23:50 +00:00
Makoto Onuki
a1bca975ef Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db548 
am: 07f8d94c6e

* commit '07f8d94c6e53cfd7dd389027fc2471ce5ea07846':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: Id5755e333af7552537ddf02c07f0ef12d998b427
 2016-04-28 20:18:34 +00:00
Makoto Onuki
16d4eadbd9 Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev 
am: d1c30db548

* commit 'd1c30db548da90d5bc092821c6fee4b4ef060bbb':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: I798a064e17a628999568a3a68634318ff1126bf4
 2016-04-28 20:16:15 +00:00
Makoto Onuki
d1c30db548 Merge "ShortcutManager: When app's data is cleared, remove all shortcuts," into nyc-dev 2016-04-28 20:11:06 +00:00
Adrian Roos
61254356d6 Make sure all Notification actions are shown 
Ensures each action gets at least its minimum width to prevent
an overly long action from squeezing out the others.

Change-Id: Ifb6253051b556bbab4738abef12dad0bb6f3c3d6
Fixes: 27996783
 2016-04-28 19:59:46 +00:00
Abodunrinwa Toki
51a8af680b Ensure FloatingToolbar is not rendered at negative x, y coordinates. 
Bug: 28343540
Change-Id: I550a1a2389a6f90525498962709f0c82e8e310ab
 2016-04-28 19:59:57 +01:00
Makoto Onuki
9ac59d0438 ShortcutManager: When app's data is cleared, remove all shortcuts, 
as if it's uninstalled.

Fixes 28196831

Change-Id: I1a410372f9e344a10567b00057fa0770eac9fd76
 2016-04-28 10:52:02 -07:00
Jaewan Kim
6e6a6ee469 Merge "Prevent pinned stack from having extra elevation" into nyc-dev 
am: 0f01857

* commit '0f018570fff044bb68b8009815ae7e5c397d09fd':
  Prevent pinned stack from having extra elevation

Change-Id: If115698ec6168bfced727b7488cc38b833d4618a
 2016-04-28 15:13:14 +00:00
Jaewan Kim
880eff6e9b Prevent pinned stack from having extra elevation 
Pinned stack doesn't have focus, so there's no need for setting extra
elevation to show shadow for focused case.

This removes extra eleavtion for pinned stack, and improves the PIP
animation quality by preventing extra surface size change
at the end of animation.

Bug: 27364161
Change-Id: Id099a78de48b2e038a69600c94454b5cbfe0628f
 2016-04-28 21:20:18 +09:00
Badhri Jagan Sridharan
b0ec5e2114 Merge "Add low power stats to batteryhistory" into nyc-dev 
am: 5149abe

* commit '5149abe73eb52e5b0df16572397a58c295e23da3':
  Add low power stats to batteryhistory

Change-Id: I9778ada1ccc73041f4682c29d9c8d4ad1bf9e5c1
 2016-04-27 23:51:39 +00:00
Badhri Jagan Sridharan
5149abe73e Merge "Add low power stats to batteryhistory" into nyc-dev 2016-04-27 23:32:19 +00:00
Vladislav Kaznacheev
a6cfcb3e43 Grab a window with mouse click and move (no long tap). 
Currently a long tap is required. Click and drag is sufficient for mouse.
Also cleaned up some dead code.

Bug: 28428053
Change-Id: I678bdcedd74cc4bd3dfd3668b14cc8124c76bec7
 2016-04-27 14:49:54 -07:00
Dimitry Ivanov
0c6e213dc7 Merge changes I12c9448e,I928175a3 into nyc-dev 
* changes:
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class
 2016-04-27 20:32:26 +00:00
Dimitry Ivanov
cda22ed541 resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp 
Change-Id: I09c5c2881947b28547a40febf32f02722b03ef81
 2016-04-27 13:16:17 -07:00
Justin Klaassen
6183b722de Support view transformations when positioning floating CAB 
Bug: 24088745

Use ViewGroup#getChildVisibleRect to transform the reported content
rect into the coordinate system of the root view. This allows the
floating CAB to be positioned correctly for views that may have a
scale (or other transforms) applied.

Change-Id: Ia6733a461b44070e7f6bab42f0b6fe2aed6870e5
 2016-04-27 13:12:08 -07:00
Badhri Jagan Sridharan
68cdf1997f Add low power stats to batteryhistory 
Exports SOC specific low power state info to batterystats service.
BatteryStats service queries the powerHAL module whenever and
updates the HistoryStepDetails whenever setBatteryState is called by the
BatteryService. The stats get appended to the battery history whenever
there is a change in the battery level.

Bug: 26564574
Change-Id: I02b4db00aec0c69d1558492224f3a4dc1c386fa6
 2016-04-27 13:08:40 -07:00
Jeff Hao
6fdf5951ae Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev 
am: 864bc48

* commit '864bc48e0104451e20281258429677a9ebbab9ac':
  Support to pass <uses-library> option through to dex2oat.

Change-Id: Ia276b7594e31177f0295e03982aae96267367887
 2016-04-27 20:02:24 +00:00
Dimitry Ivanov
89dad3360e Create linker namespace for the system server classloader 
Bug: http://b/27702070
Change-Id: I12c9448e877202937cf558de75042bcb46f6a933
(cherry picked from commit eb5866d4b0)
 2016-04-27 11:42:29 -07:00
Dimitry Ivanov
b1ef62bb38 Extract pathclassloader initialization to a separate class 
To be able to reuse this code when creating a classloader for
the system_server.

Bug: http://b/27245894
Bug: http://b/27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
(cherry picked from commit 5d7d777fa6)
 2016-04-27 11:38:41 -07:00
Dimitry Ivanov
fa8b96c6c1 Merge changes from topic \'target-sdk-0-fix\' 
am: 493576b

* commit '493576bc5db94068b5a767021a4a5c8b6963c836':
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class

Change-Id: Ifbebd0a98c3d80620b53bf7ebef76222e57ca923
 2016-04-27 18:33:55 +00:00
Jeff Hao
c7b9482b0c Support to pass <uses-library> option through to dex2oat. 
This change takes an app's shared libraries specified by <uses-library>
and passes it through to dex2oat to be used during compilation.

Part of a multi-project change.

Bug: 26880306

(cherry-picked from 7b331b6a8a)

Change-Id: I523b1b74775e7ed27072498509e743f1f10b1164
 2016-04-27 11:11:17 -07:00