Commit Graph

6298 Commits

Author SHA1 Message Date
The Android Automerger
10b889de7d stephenli Manually merge commit '68fffa5'
* commit '68fffa5': (23 commits)
  Fix smallest width configuration calculation
  docs: DoDS, wearable reference docs
  Switch the default text selection handles to Material style.
  docs: Noted minor API changes in release notes
  docs: added "billions" doc in Distribute>Essentials
  Remove wear design pages redirecting to design/wear
  correct the support library redirects to redirect whole path
  Stop saving ActionMenuItemView state.
  Fix iterator double-advance in ContentObserverController
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged
  Update and add attributes to the JavaDoc for VectorDrawable
  Use Q=100 JPEG instead of PNG for wallpaper display
  Fix issue #28400000: Settings memory UI still showing z-ram...
  docs: Updated support library revision history for 23.4.0
  docs: Updates to notifications for DP3
  docs: Added emoji section to api overview.
  Fixed a bug where the QS was animating wrong when closing
  Fix KeyguardManager.isSecure() to observe work profile
  cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
  Docs: Added new Whitelist feature to Data Saver for DP3
  ...
2016-05-12 02:10:33 +00:00
Jorim Jaggi
ad94d9ac26 Merge "Fix smallest width configuration calculation" into nyc-dev am: 63c09fd6cd
am: 3381482586

* commit '33814825861305032d930a95905b67c6120725b5':
  Fix smallest width configuration calculation

Change-Id: I5a380ded44ab27443c67660bb94ce4dcf47e0a17
2016-05-12 02:04:55 +00:00
Jorim Jaggi
3381482586 Merge "Fix smallest width configuration calculation" into nyc-dev
am: 63c09fd6cd

* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
  Fix smallest width configuration calculation

Change-Id: Id753dcb396d31c8bb250581889fb190e396ecf6d
2016-05-12 01:55:14 +00:00
Jorim Jaggi
63c09fd6cd Merge "Fix smallest width configuration calculation" into nyc-dev 2016-05-12 01:50:05 +00:00
Jorim Jaggi
8563943bd3 Fix smallest width configuration calculation
For calculating the smallest width, we need to iterate through all possible
orientations, snap the task bounds to a valid snap target and then use the
smallest width across all orientations.

In addition to that, when flinging the divider handle to the bottom of the
screen, we need to pass in fullscreen task bounds to avoid that this new
logic applies so the maximizing app only receives one configuration change.

Change-Id: I37aa9a40938517dfaf26770eb41327d76aec7c62
Fixes: 28469673
2016-05-11 18:33:01 -07:00
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
Clara Bayarri
b53b2bd088 Fix crash in ResolverActivity
Bug: 28540294
Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885
2016-05-11 11:20:13 +01:00
Jeff Sharkey
f506350414 Merge "Fail upgrades that change storage devices." into nyc-dev am: 1fdeb5bdf7 am: bd92d3c267
am: d7fe2a02be

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

Change-Id: Ia2fa24453a913d6cf9bca5fcd639973b67325ef9
2016-05-11 01:12:59 +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
da45222e0a Merge "Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3aaf am: fa050d6355" into nyc-mr1-dev-plus-aosp
am: 5686771d31

* commit '5686771d31b88379b6b58c572e9c39f11a48fa46':
  Fix status bar background flicker

Change-Id: I87a4eacafcc9c7178d95844c8b7e5675bc1d5ecb
2016-05-06 02:01:42 +00: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
7a7f7412cf Merge "Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev am: 9f76abc8ab am: 94c9aadc99" into nyc-mr1-dev-plus-aosp
am: 20fce5ed58

* commit '20fce5ed585ae0200927b50122366fd0196c565f':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: I4f1a8071c8cb2c02cb6f8a6ef614363ae73682c3
2016-05-05 22:12:30 +00:00
Dianne Hackborn
906bf903b4 Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev am: d90be6cccc am: 9071cacdbe
am: 9b560795e2

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

Change-Id: If3d2f01c1e0aacdcf7ef44eeef46ea84dbfb3b32
2016-05-05 22:12:08 +00: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
8977440c8f Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev am: bd1708a19d am: 221240d75d
am: 9814d5e68b

* commit '9814d5e68b407330eced28f3775d78733670e0d4':
  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: I84d308bbf3d8cb4656539eaa65b1c7af99fcbed0
2016-05-03 22:06:06 +00: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
b970e9bf01 Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed am: a04fe4fc92
am: 6609b23ae0

* commit '6609b23ae0ce114cd44c4cef1e3c4ebd98bc1623':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I08542776d74a1804e8787458f5f1688fafc34f18
2016-05-03 20:25:16 +00:00
Abodunrinwa Toki
6609b23ae0 Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed
am: a04fe4fc92

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

Change-Id: I37c2543c0c53031a779c3cb93668a4e824eb98b6
2016-05-03 20:22:27 +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
a021b1ebfa Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev am: 00194e0f24 am: 45b8afabc0
am: 2110964764

* commit '211096476447865bc243259b4e3046a766dfe754':
  BatteryStats: Fix units on battery charge counter

Change-Id: Id9117da75a7cdc3b4f9b8285de7db8a81d7cba21
2016-05-03 20:00:35 +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
752c5d9157 Merge "Fix FloatingToolbar popup positioning." into nyc-dev am: 344d23c0fa am: d162fa3401
am: de2d9a1dc5

* commit 'de2d9a1dc5b07905740915225a2559a2e1c364d9':
  Fix FloatingToolbar popup positioning.

Change-Id: I957b66612db297b1b069b547a20ca595cf874a8e
2016-05-03 18:27:20 +00: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
Vladislav Kaznacheev
efbebb8c9d Handle drop correctly in BaseIWindow
Bug: 28475039
Change-Id: I6a30be0f2c5fe694e85681af387abeabacff9fc9
2016-05-03 09:39:15 -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