Commit Graph

6210 Commits

Author SHA1 Message Date
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
d1c30db548 Merge "ShortcutManager: When app's data is cleared, remove all shortcuts," into nyc-dev 2016-04-28 20:11:06 +00: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
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
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
Dimitry Ivanov
eb5866d4b0 Create linker namespace for the system server classloader
Bug: http://b/27702070
Change-Id: I12c9448e877202937cf558de75042bcb46f6a933
2016-04-27 10:22:09 -07:00
Joe LaPenna
d1d80c29a6 Allow "disk reads" to sysfs in battery stats
BUG: 28406622

Change-Id: I9792bfc1e913c31e4cc386c5633f6a47ce311a7c
2016-04-27 16:26:34 +00:00
Oren Blasberg
84fa55e84a Merge "Show cascading popup menus if screen is big enough." into nyc-dev am: c71b630 am: 6ba6820
am: 2e63b8f

* commit '2e63b8fdd908f91d508f7fe95eb8599ee5d08b88':
  Show cascading popup menus if screen is big enough.

Change-Id: Iddd564294d1f075819225ed60fe48ff71204d6b5
2016-04-27 01:24:51 +00:00
Oren Blasberg
f6a02c4cda Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0 am: 1fab8d9
am: 306ceb8

* commit '306ceb84b4c8833eaa46093fbba7638378eee456':
  Accommodate NaN in new context menu methods.

Change-Id: Iddd48717534ab7ce5ef93aab0016190a50c42e9b
2016-04-27 01:23:54 +00:00
Oren Blasberg
dc9a368d5c Merge "Don\'t show icons for top level menus unless forced." into nyc-dev am: 0967da3 am: bddf236
am: f7f2360

* commit 'f7f23601df96ca0be4dc678699628874d2fbfeb9':
  Don't show icons for top level menus unless forced.

Change-Id: Iab013f2331781f8b0a6edf23119333ffb23fc1c7
2016-04-27 01:22:35 +00:00
Oren Blasberg
2e63b8fdd9 Merge "Show cascading popup menus if screen is big enough." into nyc-dev am: c71b630
am: 6ba6820

* commit '6ba68207a3474bed3333038cd59120ab924ca967':
  Show cascading popup menus if screen is big enough.

Change-Id: I91bebc9226ab008ccd42256928641d671ac2d448
2016-04-26 23:16:21 +00:00
Oren Blasberg
306ceb84b4 Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0
am: 1fab8d9

* commit '1fab8d995e74de2128b45d9cae294c8d5ccf2fc6':
  Accommodate NaN in new context menu methods.

Change-Id: Ifaf625d13b5dc57cf69f10ef1af99aef4acfecb6
2016-04-26 23:16:14 +00:00
Oren Blasberg
f7f23601df Merge "Don\'t show icons for top level menus unless forced." into nyc-dev am: 0967da3
am: bddf236

* commit 'bddf236208aa083cc1b29a1da6f8edc9ef3deec6':
  Don't show icons for top level menus unless forced.

Change-Id: I5e6fe8e0ed308cbdec7038111be4c3e7ca0e721a
2016-04-26 23:16:10 +00:00
Oren Blasberg
00c82a9b98 Merge "Show cascading popup menus if screen is big enough." into nyc-dev
am: c71b630

* commit 'c71b6302fe368ca2fbd4555177acf3cd157f6340':
  Show cascading popup menus if screen is big enough.

Change-Id: I26afd14fc851015788394ff5192c243795211567
2016-04-26 22:53:56 +00:00
Oren Blasberg
27e0f35620 Merge "Accommodate NaN in new context menu methods." into nyc-dev
am: a86d1e0

* commit 'a86d1e0b5938cee1d76aefcc1e8967c353ea922d':
  Accommodate NaN in new context menu methods.

Change-Id: I40a1d6b55b7f9cb422d35c1f0881efccd36cc290
2016-04-26 22:53:40 +00:00
Oren Blasberg
4f561a4748 Merge "Don\'t show icons for top level menus unless forced." into nyc-dev
am: 0967da3

* commit '0967da398901dd2ac626152a4802c822ca36c63b':
  Don't show icons for top level menus unless forced.

Change-Id: Ie6e0d7150f4c7d5af5f1fb22719e5bac0f22d4f0
2016-04-26 22:53:34 +00:00
Oren Blasberg
c71b6302fe Merge "Show cascading popup menus if screen is big enough." into nyc-dev 2016-04-26 22:43:39 +00:00
Oren Blasberg
a86d1e0b59 Merge "Accommodate NaN in new context menu methods." into nyc-dev 2016-04-26 22:41:01 +00:00
Oren Blasberg
0967da3989 Merge "Don't show icons for top level menus unless forced." into nyc-dev 2016-04-26 22:38:58 +00:00
Dimitry Ivanov
5d7d777fa6 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
2016-04-26 13:16:54 -07:00
Chris Banes
6c9bed0224 Merge "Fix onPrepareActionMode() not being called" into nyc-dev am: 9412176 am: 6ade4d1
am: fb24d4f

* commit 'fb24d4f07793df29d999819d5394b6000d140c0a':
  Fix onPrepareActionMode() not being called

Change-Id: I933be0d2b28dd9d2f1dce17e2b746dadf3b9e764
2016-04-26 19:33:43 +00:00
Chris Banes
6ade4d1067 Merge "Fix onPrepareActionMode() not being called" into nyc-dev
am: 9412176

* commit '94121762ff47728fd8080f45f04cafb55b92079d':
  Fix onPrepareActionMode() not being called

Change-Id: Ic6f51f65f9d82b490ef26c89725b228f0568bdd9
2016-04-26 19:26:57 +00:00
Jaewan Kim
9ea37b9bee Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev am: bdc4700 am: 0f360d8
am: 8416446

* commit '8416446ef78d6e51069027f7e8f8148b340b4332':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: I3ac695a7729ceb8e8c06e6df150fe3be1c351d7f
2016-04-26 16:07:31 +00:00
Chris Banes
3cff56b678 Fix onPrepareActionMode() not being called
Happens because mActionMode was set at the end
of the call, which means that invalidate() doesn't
actually do anything.

BUG: 28392319
Change-Id: Ifdc97c03dc43bfbe74790f90764d1575bd9ca951
2016-04-26 12:53:59 +01:00
Jaewan Kim
0f360d80ad Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
am: bdc4700

* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: Ic77538cac9562acf878c7c56f443a691e9d0b45f
2016-04-26 06:08:59 +00:00
Jaewan Kim
f0fd218382 PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Bug: 27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
2016-04-26 13:06:21 +09:00
Oren Blasberg
7b457455c4 Don't show icons for top level menus unless forced.
Prior to this CL, the cascading implementation would evaluate the
contents of the menu to determine whether to show an icon for this case.
However, the policy we have upheld is that top level menus should
never show an icon for this case. (Unless setForceShowIcon(true) was
called.)

Bug: 28275346
Change-Id: I09423596d49742aa7a9ba7245702c099581c0b48
2016-04-25 16:17:18 -07:00
Oren Blasberg
93c195894d Show cascading popup menus if screen is big enough.
...even if in split screen mode.

Bug: 28175404
Change-Id: I63ff60090e299e48f2273477dc3b820d4d95db8d
2016-04-25 15:58:46 -07:00
Tobias Thierer
8eb2e9d6e5 Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp am: cc0eaf4
am: 334a936

* commit '334a936e154fd18a301f7df860322e456ec0486e':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I626df98f9cea04e782e837e6ddf0d37690306b70
2016-04-25 10:04:05 +00:00
Tobias Thierer
b0800dce4a Avoid instantiations of Boolean that are immediately unboxed.
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).

Also fixed a couple of other valueOf()s in SyncStorageEngine.

Bug: 28289401
(cherry-picked from commit ca01820735)
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
2016-04-25 10:47:02 +01:00
Tobias Thierer
71502c44fa Merge "Avoid instantiations of Boolean that are immediately unboxed."
am: 823e05b

* commit '823e05b2db229549c33892a0aa303fd7fb10a214':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I170bf470d63faec93c228ae897796a2e6067da7e
2016-04-25 09:14:15 +00: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
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
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
Adam Lesinski
6a4d9a3c9f Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev 2016-04-22 22:20:36 +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