Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,889 Commits 3 Branches 0 Tags
14066c8ae9fe6a8b7987407feeb9e299383bb515
Commit Graph

65217 Commits

Author SHA1 Message Date
Clara Bayarri
14066c8ae9 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am: f48f390 am: dea459c 
am: d3cd71b

* commit 'd3cd71b8a9c781921f6e4efe9685284bf1f4c6df':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: Ia0b104bc5e689aa168bf4e7414ec82ff000c040d
 2016-04-25 09:49:27 +00:00
Clara Bayarri
dea459c750 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev 
am: f48f390

* commit 'f48f390a60694df6f4b72bd0ac462dd19c5e1191':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: I36a85346b9b5a8606b75cf670ddbc67ab9831377
 2016-04-25 09:39:35 +00:00
Clara Bayarri
f48f390a60 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev 2016-04-25 09:31:06 +00:00
Seigo Nonaka
39abb7cf51 Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: 33ed899 
am: b900d9f

* commit 'b900d9f77c30c92ee446c9abde81f2b0f4303f64':
  Fix unexpected truncation again.

Change-Id: I7fd698ce618c43745184883137772b776bc6166d
 2016-04-25 03:52:15 +00:00
Seigo Nonaka
b900d9f77c Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e 
am: 33ed899

* commit '33ed8993e93b6c8cf0b595a5cd49fedc8c468cba':
  Fix unexpected truncation again.

Change-Id: Ie27f994a7714074ddb8e3013fee648ef7a98db18
 2016-04-25 03:47:23 +00:00
Seigo Nonaka
cb5abde896 Merge "Fix unexpected truncation again." into nyc-dev 
am: ab8913e

* commit 'ab8913e364d296fdb62e6b2572d102063bff42cb':
  Fix unexpected truncation again.

Change-Id: I62bd788fccf05f4ca4c8ef5879576d48fd083086
 2016-04-25 03:42:38 +00:00
Seigo Nonaka
ab8913e364 Merge "Fix unexpected truncation again." into nyc-dev 2016-04-25 03:36:30 +00:00
Selim Cinek
791e3f85c3 Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be7 am: 21b28f2 
am: 9ea6705

* commit '9ea6705d5b0dcd57a6849f26b7582b859999dff3':
  Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ic2fd4ca7b66a18aec74fd51b36a44cadbd2af85d
 2016-04-24 15:00:18 +00:00
Selim Cinek
21b28f2af0 Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev 
am: 14d8be7

* commit '14d8be728bbca1e7d721479fa1476e23e1b7accf':
  Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ia8e3f178eae3e6be06f6b557c345866261a9eac8
 2016-04-24 14:51:34 +00:00
TreeHugger Robot
14d8be728b Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev 2016-04-24 14:44:28 +00:00
Chris Banes
c1ede9aa2e Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: bdc6966 
am: 9465c72

* commit '9465c720f53d3ca7d0fa2311c887b727db3fdbaf':
  Make AbsSavedState read using given ClassLoader

Change-Id: Ia1ee1a8609c3cf7815e596cc74658dc4bb04c01e
 2016-04-23 07:16:42 +00:00
Chris Banes
bdc696607b Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev 
am: b02d51b

* commit 'b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f':
  Make AbsSavedState read using given ClassLoader

Change-Id: If0e2679ca978a0423ff26e7b0f416d09c50ab70b
 2016-04-23 07:09:22 +00:00
Chris Banes
b02d51b3d3 Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev 2016-04-23 07:04:21 +00:00
Adrian Roos
129dc96a38 Merge "Fix content description for notification icons" into nyc-dev am: eefff37 am: 18a98c1 
am: a04e33a

* commit 'a04e33a2dc2f0a2ac7b9966b3739d9142c1bd749':
  Fix content description for notification icons

Change-Id: Id2c9b4c5cd490254380c4a98ed65ef48fdbf91b9
 2016-04-23 01:56:46 +00:00
Adrian Roos
18a98c1fd8 Merge "Fix content description for notification icons" into nyc-dev 
am: eefff37

* commit 'eefff3742de62101341128a32b227a25ed22df06':
  Fix content description for notification icons

Change-Id: I35b24b57ffe34f81007cf6fb7ae860998b6ca65c
 2016-04-23 01:51:02 +00:00
TreeHugger Robot
eefff3742d Merge "Fix content description for notification icons" into nyc-dev 2016-04-23 01:45:02 +00:00
Selim Cinek
07c8017bc2 Fixed the paddings in inbox style to match the rest of the templates 
Change-Id: Ib7701ac29d5f8a123441fbf6d95a5b0b9cadfb4e
Fixes: 27998488
 2016-04-22 18:09:17 -07:00
Adam Lesinski
042799c06d Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 8414b87 
am: 34e3a5f

* commit '34e3a5f72daa73f69956aace6583370d82902171':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I08d997bc9c0fc96c54eee8dda69e3c62005b38e5
 2016-04-23 00:29:37 +00:00
Adam Lesinski
8414b87f6c Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev 
am: 1a8a717

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Iaab0fd5bf59399a3ef2bfe2eb3904ec13691e186
 2016-04-23 00:23:56 +00:00
Adam Lesinski
1a8a717ab5 Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev 2016-04-23 00:20:11 +00:00
Adrian Roos
eba0582af1 Fix content description for notification icons 
Change-Id: Icb4c6d8a77211d0c8922e28958609a332b19dfcc
Fixes: 27552350
 2016-04-22 17:09:30 -07:00
Adam Lesinski
d49dbec96a Merge "Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev am: 6a4d9a3 am: fc6f395" into nyc-mr1-dev-plus-aosp 
am: 5acf0f0

* commit '5acf0f071da967926d8e473df13d4404f3b98a9b':
  BatteryStats: use the same timestamp for comparing intervals

Change-Id: I81f64a0d5bea38b8426e96eb7a52da05fea36d8f
 2016-04-22 22:35:45 +00:00
Svet Ganov
879f5ba3f7 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c 
am: 13da561

* commit '13da5613e2fce0ca2d5682fd202234856d2206e9':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: Ibe4a6258c6437a9e86ed25e242301ca6d6635d26
 2016-04-22 22:35:29 +00:00
Adam Lesinski
fc6f395d33 Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev 
am: 6a4d9a3

* commit '6a4d9a3c9f7cbd30a7093f5088a72271a5e504c7':
  BatteryStats: use the same timestamp for comparing intervals

Change-Id: I0c32c75176bd1e154ed0286f8426807d0221204a
 2016-04-22 22:24:39 +00:00
Svet Ganov
70d720ca72 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev 
am: c947ebd

* commit 'c947ebd66d397782af0870df457ccc4fe83c77cc':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: I50e4c8357bb0c5abab9c37b6a39628f6e3e0ea1b
 2016-04-22 22:24:36 +00:00
Adam Lesinski
6a4d9a3c9f Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev 2016-04-22 22:20:36 +00:00
Svetoslav Ganov
c947ebd66d Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev 2016-04-22 22:18:29 +00:00
Adam Powell
f19c1c6634 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev am: d2285b1 am: e849829 
am: 9aff58d

* commit '9aff58d6204d58c04b4257519f8dfeab1fd00033':
  Remove dependencies on Activity from common Fragment superclasses

Change-Id: I6c6e35c552fb7699e3d44a364f18624b888011df
 2016-04-22 22:10:38 +00:00
Adam Powell
e849829569 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev 
am: d2285b1

* commit 'd2285b1f40a714a49602dab5645c194af0eac880':
  Remove dependencies on Activity from common Fragment superclasses

Change-Id: Ic0da5094cae15e03f139eae6ed2760a6cd126e0c
 2016-04-22 21:49:30 +00:00
Adam Lesinski
757c6eacc8 BatteryStats: Fix up semantics of SamplingTimer 
SamplingTimer has been losing some data, as well as not correctly handling
entries that have gone away and come back with less data (reset).

This change correctly ends a SamplingTimer sample by adding the accumulated amount
to the total, then reseting the running counter to accept new values.

This is also triggered automatically when the incoming data is less than what is currently
recorded.

Bug:25695597
Change-Id: I6b540906e6be527578d1003485384a75ba211b52
 2016-04-22 14:48:18 -07:00
Adam Powell
d2285b1f40 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev 2016-04-22 21:43:16 +00:00
Svetoslav Ganov
d1bd91aae8 Merge "Disallow disable of the system shared libs." into nyc-dev am: 5a91b61 am: 50d08f8 
am: 115ee83

* commit '115ee8340fd0ef4090550f046e2da51f476d32c0':
  Disallow disable of the system shared libs.

Change-Id: I9f96c94d6a0007ea602ef0c923e9079dceff4094
 2016-04-22 21:37:28 +00:00
TreeHugger Robot
37d6a74d6c Merge "Merge "Force pinned windows to always be scaleable." into nyc-dev am: e67960e am: 6ce373a" into nyc-mr1-dev-plus-aosp 
am: 69a8981

* commit '69a89816f9b7fb016e43e7e68236e37c45e35e42':
  Force pinned windows to always be scaleable.

Change-Id: I40ad7e8fcee70903e0998487ad144c75d39c12f8
 2016-04-22 21:33:54 +00:00
Alex Hills
fae5c81aa5 Merge "Changes Message from using parcels to bundles" into nyc-dev am: 9ef0ce1 am: 7bdd6a5 
am: a384cda

* commit 'a384cdae6494d60149043ca244b76761c9c27dca':
  Changes Message from using parcels to bundles

Change-Id: Icb2bbe938f13036e51a650e85bee45b741c5004c
 2016-04-22 21:30:51 +00:00
Svet Ganov
ae0e03a9e0 Cleanup of the PackageInstaller API - Frameworks 
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: I9814eafd0b22ae03b4b847a7007cdbf14c9e5466
 2016-04-22 14:18:32 -07:00
Svetoslav Ganov
115ee8340f Merge "Disallow disable of the system shared libs." into nyc-dev am: 5a91b61 
am: 50d08f8

* commit '50d08f81d7c9e614f2a3f23fd815bbc183419874':
  Disallow disable of the system shared libs.

Change-Id: I689b99c36e7037ef4efbcbccea04be33e442c84e
 2016-04-22 21:09:55 +00:00
Svetoslav Ganov
599bf728de Merge "Disallow disable of the system shared libs." into nyc-dev 
am: 5a91b61

* commit '5a91b615232374084a45752d7c09c25265e263ed':
  Disallow disable of the system shared libs.

Change-Id: I111c0285b73ffa64594c39b54d18d5d3ff670953
 2016-04-22 21:07:11 +00:00
Svetoslav Ganov
5a91b61523 Merge "Disallow disable of the system shared libs." into nyc-dev 2016-04-22 21:03:30 +00:00
Rakesh Iyer
d223fb7136 resolve merge conflicts of 72c0452 to master 
Change-Id: I1b9e27569762afe14935d75d35438cbd271c11cb
 2016-04-22 13:07:45 -07:00
Robert Carr
6ce373a4c8 Merge "Force pinned windows to always be scaleable." into nyc-dev 
am: e67960e

* commit 'e67960ecae2ba008a7d1d364b5fdb1b95a179e52':
  Force pinned windows to always be scaleable.

Change-Id: Ie5faf56b2f9ad25d0d9977970fedb681ca72c628
 2016-04-22 19:18:53 +00:00
TreeHugger Robot
e67960ecae Merge "Force pinned windows to always be scaleable." into nyc-dev 2016-04-22 19:13:23 +00:00
Adam Powell
31479e33e6 Remove dependencies on Activity from common Fragment superclasses 
Allow common Fragments to be used in non-Activity hosts.

Bug 28337394

Change-Id: Id3baa3ef19ea41ff43ca76be89ced7530fbadfab
 2016-04-22 12:11:28 -07:00
Alex Hills
7bdd6a5c87 Merge "Changes Message from using parcels to bundles" into nyc-dev 
am: 9ef0ce1

* commit '9ef0ce1749e626a47d669a3f4b059ba748d2e69e':
  Changes Message from using parcels to bundles

Change-Id: If39af54393915b539a7724deda9404cf4d795f36
 2016-04-22 19:01:15 +00:00
Alex Hills
49fff88f8a Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev am: cb1f9da am: a6bc9fa 
am: 1f2c9f2

* commit '1f2c9f2283287f5f877deb262b30569f072d4af9':
  Adds a BigPicAmbient flag to WearableExtender

Change-Id: Ie53c3fd0b7124cc4ddd92571041669f5a82732f1
 2016-04-22 18:49:32 +00:00
Winson
b5726c5963 Merge changes I222e50f6,I9832874d into nyc-dev 
am: 6c83c7a

* commit '6c83c7aa5f84680ffd53d3e318279cbead8b1af5':
  Removing legacy calculation of Recents visibility.
  Adding additional dump logging to track down bugs.

Change-Id: I20c8aeb4b943284b2bee2b7d45d3530a5d6dfa06
 2016-04-22 18:37:02 +00:00
Alex Hills
a6bc9fa6c2 Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev 
am: cb1f9da

* commit 'cb1f9da55b2960f7cabd9c50632f2ac9d8a3311a':
  Adds a BigPicAmbient flag to WearableExtender

Change-Id: I37e02f365854200f34a4d6cad52300e4e0ccd253
 2016-04-22 18:36:57 +00:00
Alexander Hills
9ef0ce1749 Merge "Changes Message from using parcels to bundles" into nyc-dev 2016-04-22 18:32:49 +00:00
Winson Chung
6c83c7aa5f Merge changes I222e50f6,I9832874d into nyc-dev 
* changes:
  Removing legacy calculation of Recents visibility.
  Adding additional dump logging to track down bugs.
 2016-04-22 18:22:02 +00:00
Jeff Hao
e1d41fcc0d Merge "Support to pass <uses-library> option through to dex2oat." 2016-04-22 18:20:13 +00:00
Alexander Hills
cb1f9da55b Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev 2016-04-22 18:11:46 +00:00