Commit Graph

6248 Commits

Author SHA1 Message Date
Dianne Hackborn
398216dc9c Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: b3edcd78d2
am: fc101121f2

* commit 'fc101121f23c292277cb8a54c35c07c4d98de67d':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: Ic0d46a17246d9882675c992b81d068be88cd5f74
2016-05-12 01:00:06 +00:00
Aurimas Liutikas
9daaf21eb5 Merge "Stop saving ActionMenuItemView state." into nyc-dev am: b9bb8e88c6
am: 69abd9bac2

* commit '69abd9bac2c3f2c6743cea86b0f6aa953485f7de':
  Stop saving ActionMenuItemView state.

Change-Id: Id84fbd964fdd9d89f52346c436ea418b689df2e8
2016-05-12 00:59:28 +00:00
Dianne Hackborn
fc101121f2 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev
am: b3edcd78d2

* commit 'b3edcd78d25372a2a1e7520b63da1d5d38fbe59f':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: I1eda5e59bdd122dd35a8025b35b63b216ca9e60d
2016-05-12 00:50:42 +00:00
Dianne Hackborn
b3edcd78d2 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 2016-05-12 00:40:18 +00:00
Aurimas Liutikas
69abd9bac2 Merge "Stop saving ActionMenuItemView state." into nyc-dev
am: b9bb8e88c6

* commit 'b9bb8e88c66a80ca43e5aabad94348fdaf0fef1d':
  Stop saving ActionMenuItemView state.

Change-Id: Ic8ee0f6d55cae78dd6da72ea8ea269b1ad735753
2016-05-12 00:39:19 +00:00
Aurimas Liutikas
9c661a40c1 Stop saving ActionMenuItemView state.
There is no useful state to be saved for these views.
This fixes a crash where we try to restore the state of an
ActionView (that shares the same ID as ActionMenuItemView).

Framework version of ag/1020805

Bug: 28110832
Change-Id: I4a09786a1c08bef1765fd8be3affb21dce296272
2016-05-11 14:46:47 -07:00
Dianne Hackborn
ef0a402f58 Fix issue #28400000: Settings memory UI still showing z-ram...
...but probably shouldn't.

Keep track of whether zram is being included in per-process pss and,
if so, don't add it on separately.

Change-Id: Ic945fc3deca8412272bb6019fe1be4b878cb763a
2016-05-11 14:21:07 -07:00
Clara Bayarri
9b4ccde88d Fix crash in ResolverActivity
am: 9550f5dfa6

* commit '9550f5dfa607b1c464c2673186ee26e4b12a79d6':
  Fix crash in ResolverActivity

Change-Id: I57b593f67937556ea6268be0a43bcd8fe6da6e68
2016-05-11 15:08:05 +00:00
Clara Bayarri
9550f5dfa6 Fix crash in ResolverActivity
Bug: 28540294
Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885
(cherry picked from commit b53b2bd088)
2016-05-11 14:57:37 +00:00
Jeff Sharkey
d7fe2a02be Merge "Fail upgrades that change storage devices." into nyc-dev am: 1fdeb5bdf7
am: bd92d3c267

* commit 'bd92d3c26722e4a435e1c46364cddb27a222df7d':
  Fail upgrades that change storage devices.

Change-Id: Id9e9becd2a18bdeff760fd1b940465388f906d1c
2016-05-11 01:10:07 +00:00
Jeff Sharkey
ae32884c48 Merge "Fail upgrades that change storage devices." into nyc-dev
am: 1fdeb5bdf7

* commit '1fdeb5bdf7530eef212b414860569202eb5a68fa':
  Fail upgrades that change storage devices.

Change-Id: I8f0a6ee997552743ee26a965e91809a737e6f0ff
2016-05-11 01:07:23 +00:00
Jeff Sharkey
bd92d3c267 Merge "Fail upgrades that change storage devices." into nyc-dev
am: 1fdeb5bdf7

* commit '1fdeb5bdf7530eef212b414860569202eb5a68fa':
  Fail upgrades that change storage devices.

Change-Id: I88868123f5122c039a9aea19b6fdd9ecae089972
2016-05-11 01:07:22 +00:00
Clara Bayarri
b44ddbb5b3 Merge "Add Tron logging for open/close App Disambig" into nyc-mr1-dev
am: f4f15d582a

* commit 'f4f15d582a60b9324e4b1e4f3276f4cc4b2b0531':
  Add Tron logging for open/close App Disambig

Change-Id: I77ba68bc54cfa0a6b382adce4f1605196a07aab4
2016-05-10 23:53:13 +00:00
Jeff Sharkey
2d3709246e Fail upgrades that change storage devices.
Now that we live in an FBE world, we need the user to be involved
with every package move to ensure that CE storage is unlocked.  This
means that a package upgrade session that would require moving an
app between storage devices cannot be satisfied.

Bug: 27147501
Change-Id: I274d85cbed727d9185178b77bfc6cef196df17f5
2016-05-10 17:01:51 -06:00
Clara Bayarri
fa902aaa61 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-05-10 15:15:29 -07:00
Chris Craik
555271d3ae Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3aaf
am: fa050d6355

* commit 'fa050d635590328fc787fb14d964585a5641461f':
  Fix status bar background flicker

Change-Id: Ia8f181646bbd1943fb7a8e04cc9571a56a5051f7
2016-05-06 01:59:05 +00:00
Chris Craik
d482c7703a Merge "Fix status bar background flicker" into nyc-dev
am: d0fa4d3aaf

* commit 'd0fa4d3aafa42da696c006ab96a11ed54deec14c':
  Fix status bar background flicker

Change-Id: Ifee7d5aaa5ffb9fe7c7c822eb9805c4c71d36fc0
2016-05-06 01:57:00 +00:00
TreeHugger Robot
d0fa4d3aaf Merge "Fix status bar background flicker" into nyc-dev 2016-05-06 01:49:34 +00:00
Chris Craik
867b812eff Fix status bar background flicker
Fixes: 28533578

Change-Id: I075f49b7d20e0e95e790a9755d104a0a51575054
2016-05-05 16:22:21 -07:00
Yohei Yukawa
94c9aadc99 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev
am: 9f76abc8ab

* commit '9f76abc8ab9db3306c8061e9719dbe2a998031f3':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: If27212387cd76bb6cc7f1cd1d844bd3ca07915e8
2016-05-05 22:02:30 +00:00
Dianne Hackborn
9071cacdbe Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev
am: d90be6cccc

* commit 'd90be6cccca683e34566f5550ebb34f1c8e75b69':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: I2671260e69f3a3b07fd183fa97c274bea7520aca
2016-05-05 22:02:22 +00:00
Yohei Yukawa
9f76abc8ab Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev 2016-05-05 21:55:50 +00:00
Dianne Hackborn
5a969aa139 Fix issue #28602068: Add count to job scheduler stats
Also increase the event buffer size to 100, and implement
it as a real ring buffer.  And put that implementation in
a generic class for use in other places.

Change-Id: I06936984e2c253fb5f0eb5d15faf0019ec73d4e2
2016-05-04 17:19:04 -07:00
Winson
221240d75d Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev
am: bd1708a19d

* commit 'bd1708a19da3ae205c4da3f22d0682c9bd1f76fe':
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.

Change-Id: Ib97a145fc6ff4e761a7220979913ed5be9e8fb71
2016-05-03 22:01:30 +00:00
Winson Chung
bd1708a19d Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev
* changes:
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.
2016-05-03 21:57:03 +00:00
Abodunrinwa Toki
98f91884ff Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev
am: f62dd564ed

* commit 'f62dd564edfa7f9e02e17e7a2e3107dbc7b4abb0':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I8adae611f525a14dadc2fc0e2c15cc961b61d0cf
2016-05-03 20:20:05 +00:00
Abodunrinwa Toki
f62dd564ed Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev 2016-05-03 20:13:26 +00:00
Adam Lesinski
45b8afabc0 Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev
am: 00194e0f24

* commit '00194e0f2468d3848aee7e65e542bb5224cfd44a':
  BatteryStats: Fix units on battery charge counter

Change-Id: I8f58fc683e0f32fd587c31344f51ad2d311570a3
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
Abodunrinwa Toki
4e7a1208ea Implement alternative ViewGroup.getChildVisibleRect.
This CL allows getChildVisibleRect to optionally always call the
view's parent. The previous version attempted to optimize the call
by not calling further up the view heirarchy when the rect isn't
visible in the current view.

The call is hidden and the previous behaviour is preserved to limit
the bits of code that this change affects.

Bug: 28514727
Change-Id: I49550ed4082bcbdcfe4643b962b50f3308092525
2016-05-03 19:41:15 +01:00
Abodunrinwa Toki
d162fa3401 Merge "Fix FloatingToolbar popup positioning." into nyc-dev
am: 344d23c0fa

* commit '344d23c0fadd9714453a2bfdebf1d1b304105acf':
  Fix FloatingToolbar popup positioning.

Change-Id: I0ef15668c3c0bf4a064871a631b704456d3b6785
2016-05-03 18:22:41 +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
Abodunrinwa Toki
0780f3a073 Fix FloatingToolbar popup positioning.
The FloatingToolbar popup wrongly assumes that the main content panel
is wider than the overflow panel. In situations where this assumption
fails, the toolbar popup is positioned wrongly within it's container
window and items appear truncated. This CL fixes this issue.

Bug: 28550367
Change-Id: I41669b1deed7dd34f0b2bd060d14452482d3d36c
2016-05-03 16:25:41 +01:00
Winson
9832f8f463 Fixing issue with docking being disallowed for secondary user.
- When a task is docked, the context is not correct for the given user.

Bug: 28195260
Change-Id: I59f73caf818d294c146d215c2bd31dbe1d4c7c5a
2016-05-02 16:40:00 -07:00
Jaewan Kim
1e28182362 Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev
am: bfa0f48407

* commit 'bfa0f48407e70099c2558983b19163c1d92d063b':
  Fix crash when device doesn't support picture-in-picture

Change-Id: Icbbe69970e5f43387323b5ed810ebc11b1cf77b1
2016-05-02 22:36:31 +00:00
Selim Cinek
e1e991dd93 Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev
am: 33f39a96cb

* commit '33f39a96cb40850b645833528d275c455898f4d2':
  Fixed a bug where the image and the text were overlapping

Change-Id: I23bbae6c0115326c03171f227c2d4a8217f28ae5
2016-05-02 22:36:27 +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
d12ceb4d1c Merge "Make sure all Notification actions are shown" into nyc-dev
am: 9cb7652fb1

* commit '9cb7652fb19256fe61d81c7770fe729fc6b67481':
  Make sure all Notification actions are shown

Change-Id: I2fd99fc5be798e97b6e8ebc20fe1d2097d2d7c8c
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
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
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
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
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