192947 Commits

Author SHA1 Message Date
Jim Miller
16ef71f4f5 Fix crash in fingerprint and problem where directory has wrong selinux label
Fixes bug 21373942

Change-Id: I860656b0c9e26c038d03d9872c490466dc62d4e7
2015-05-21 17:48:59 -07:00
Adrian Roos
c5d8fbcd2e No longer trigger immersive cling on panic
Instead we now request transient bars.

Bug: 19282730
Change-Id: I75de4515e2df1964de8a52d3983540f7bb5379e8
2015-05-21 17:40:51 -07:00
Adrian Roos
5347d0185b Merge "Prevent ImmersiveModeCling from eating all touches" into mnc-dev 2015-05-22 00:09:12 +00:00
Filip Gruszczynski
91e5b0f598 Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev 2015-05-22 00:02:48 +00:00
Deepanshu Gupta
e4b47614b7 Merge "Add LayoutLibDelegate for new Bitmap method." into mnc-dev 2015-05-22 00:01:46 +00:00
Dianne Hackborn
b5a380d409 Add API to track usage time of apps.
This adds a new ActivityOption for the caller to ask the
system to track the time the user is in the app it launches,
delivering the result when they are done.

The time interval tracked is from when the app launches the
activity until the user leaves that app's flow.  They are
considered to stay in the flow as long as new activities
are being launched or returned to from the original flow,
even if they cross package or task boundaries.  For example,
if the originator starts an activity to view an image, and
while there the user selects to share, which launches gmail
in a new task, and they complete the share, the time during
that entire operation will be included.

The user is considered to complete the operation once they
switch to another activity that is not part of the tracked
flow.  For example, use the notification shade, launcher, or
recents to launch or switch to another app.  Simply going
in to these navigation elements does not break the flow
(although the launcher and recents stops time tracking of
the session), it is the act of going somewhere else that
completes the tracking.

The data is delivered to the app through a PendingIntent,
which includes the total time the app was in the flow along
with a time break-down by app package.

Change-Id: If1cf8892d422c52ec5042eba0e15a8e7e8f83abf
2015-05-21 16:45:29 -07:00
Robert Shih
410239b6bf MediaPlayer: add mPreparing to weed out unwanted prepared messages
Bug: 21266735
Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc
2015-05-21 16:43:10 -07:00
Craig Mautner
15dddf3891 Merge "For getHomeActivity() only return current user." into mnc-dev 2015-05-21 23:40:27 +00:00
Selim Cinek
79d79c455b The heads up now have a margin on top and don't stick to the edge
Bug: 21337754
Change-Id: I199bc0732df62eadc2458db12a7c1059da988020
2015-05-21 23:38:30 +00:00
Selim Cinek
ffa6eb8791 Fixed a crash with HUN notifications
Bug: 20925733
Change-Id: Id96c9e476d9faa770b5bcd3c35213dd0debdeaea
2015-05-21 23:35:52 +00:00
Adrian Roos
ddc8b27878 Request transient bars after panic
Bug: 19282730
Change-Id: Ib621a837ba06847a02333e1786ea50e5d854c7d7
2015-05-21 16:28:27 -07:00
Deepanshu Gupta
a5e6298b35 Add LayoutLibDelegate for new Bitmap method.
Original method added in: 721ae5fec5f1fd4f93aa2a361a0ac298e15ce353

Change-Id: Ie14d132459638cf103c390fae3f4c0c02bef2f34
2015-05-21 23:07:15 +00:00
Griff Hazen
8f585128f5 am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit 'd4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
2015-05-21 22:58:25 +00:00
Griff Hazen
dc085ed27a am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '5825ad231319207a64debacaa3db4812548b0442':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
2015-05-21 22:58:21 +00:00
Griff Hazen
99fd373cc6 am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit 'd4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
2015-05-21 22:55:23 +00:00
Griff Hazen
77420269fe am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '5825ad231319207a64debacaa3db4812548b0442':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
2015-05-21 22:55:18 +00:00
Griff Hazen
d4e00d2b9d Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-05-21 22:43:48 +00:00
Craig Mautner
db49fec8aa For getHomeActivity() only return current user.
Previously getHomeActivity() returned the topmost home activity
independent of which user was currently running. That defeated the
purpose of the method. This fix returns the home activity of the
current user or null if one has not yet been created.

Also remove some cruft that accumulated.

Fixes bug 21055376.

Change-Id: Ic1d58129aedbe3624f8a9d12c05c84674687b0a4
2015-05-21 15:33:30 -07:00
Dirk Dougherty
0140854a63 am 85dea528: Doc change: updated images, landings, and ndk updates.
* commit '85dea528866217d4b3d40a1162c00c4e836504aa':
  Doc change: updated images, landings, and ndk updates.
2015-05-21 22:13:19 +00:00
Fyodor Kupolov
f70c9346d6 Use factory methods for RestrictionEntry
As per API council request, factory methods should be used instead of using
boolean.

Bug: 21343772
Change-Id: Ia0889e46916f4ed7edb942217880cdf9c27771c2
2015-05-21 15:08:42 -07:00
Nancy Chen
769832d111 Merge "Fix phone account component name for voicemail status entries." into mnc-dev 2015-05-21 22:01:34 +00:00
Yohei Yukawa
c0a9cd440d Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev 2015-05-21 21:47:36 +00:00
Yohei Yukawa
0f3a99d837 Do not clear IMM#mCurRootView in IMM#finishInputLocked().
This is a follow up CL for I219394178e4172bc47864297f1418e677dba.

As explained in the commit message of I219394178e4172bc47864297f,
IMM#mCurRootView needs to be synchronized with the actual window
focus more precisely to fix Bug 20820914. Hence we should not
clear IMM#mCurRootView in IMM#finishInputLocked() anymore.
Ideally this CL should have been included in the previous CL.

Manually tested following scenarios.
- Repro steps in Bug 6413553.  Made sure that IMM#mCurRootView
  is cleared after switching back from the current application to
  the previous application with back key.
- Test application that calls WebView#showFindDialog(). Made sure
  that LatinIME works fine when switching text fields.  This is
  non-trivial because android.webkit.FindActionModeCallback is
  changed in the previous CL I219394178e4172bc47864297f1418e677db.
- Repro steps in Bug 21144633.  Made sure that we can enter
  recipient's name in the messaging app.

This CL depends on I219394178e4172bc47864297f1418e677dba25e5.

Bug: 20820914
Change-Id: Id6afc8fc64512225578c62557b96c7dc2e969adf
2015-05-21 21:34:07 +00:00
Dirk Dougherty
85dea52886 Doc change: updated images, landings, and ndk updates.
Change-Id: If128f8394438471365db6f7c0a42e6b38d25d250
2015-05-21 14:33:21 -07:00
Griff Hazen
5825ad2313 Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
This CL didn't ship with diamond-release, but will make diamond-mr1.

This reverts commit 80fa3fa027c06be0f4bbd3a4ab319914377d883d.

Change-Id: I1b037b6ac6a504235463a36a5dcd152b6a1434f3
2015-05-21 14:25:50 -07:00
Griff Hazen
6c0b5b3436 Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
This CL didn't ship with diamond-release, but will make diamond-mr1.

This reverts commit c663d99f007c0faa7b66a569ec4083b82d60ef15.

Change-Id: I1430ed7a3221a4f06ad730778c757a68e16b808b
2015-05-21 14:25:05 -07:00
Jorim Jaggi
7d85ea93e9 Always tell Keyguard about occluded state
If there was a window with FLAG_DISMISS_KEYGUARD first, when the
device was unlocked, mWinDismissingKeyguard was set to that window.

Now, a window with FLAG_SHOW_WHEN_LOCKED came on top, so we set the
Keyguard as occluded, but we didn't reset the window that is
dismissing Keyguard.

After that, the old window with FLAG_DISMISS_KEYGUARD was the focused
window again. However, since we didn't reset mWinDismissingKeyguard,
we ended up with DISMISS_KEYGUARD_CONTINUE, and lockscreen was not
occluded anymore. However, we never really told Keyguard about it
because DISMISS_KEYGUARD_CONTINUE was set instead of
DISMISS_KEYGUARD_START.

The first fix of this bug is to always tell Keyguard about the
current occluded state. The second fix is to reset
mWinDismissingKeyguard in case a window SHOW_WHEN_LOCKED comes on top.

Bug: 20102975
Change-Id: I7c778df09a1e393b9eeaf51fd2013012cb40fea9
2015-05-21 21:20:14 +00:00
Jorim Jaggi
eb8f11a865 Keep status bar visible when animating in negative heights
So we don't accidentally invoke bouncer and introduce jank
when expanding again.

Bug: 18502113
Change-Id: I0206cf1f48779d0d0fc661cb27852e2d202245ba
2015-05-21 20:29:05 +00:00
Adrian Roos
3e8dd514a0 Prevent ImmersiveModeCling from eating all touches
Bug: 21330248
Bug: 19282730
Change-Id: I3982aa9582341032a41670fdf82e0321b84178d2
2015-05-21 13:27:58 -07:00
Steve McKay
4f95badec2 Merge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into mnc-dev 2015-05-21 20:27:37 +00:00
Christopher Tate
7ca242e0b4 Merge "Close race condition in binderDied()" into mnc-dev 2015-05-21 20:27:12 +00:00
Vinit Deshpande
29ad7c7000 Indicate failed scans with EXTRA_RESULTS_UPDATED
This flag indicates if scan was successful and results were
updated. It will be set to false if a scan is not performed
(intentionally) or if it failed to produce any results.

Bug: 20642015

Change-Id: I06a1fdd684932db68891ee28d5a049980f483f0f
2015-05-21 13:17:03 -07:00
Steve McKay
574b4bcd1b [mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!
BUG=21259006
Change-Id: Ic31dfa1a1cffa4340769c08db3e3cb3fb46e31d5
(cherry picked from commit e04e02d027b731448d68995a202c8867c4985fa3)
2015-05-21 20:15:31 +00:00
Nancy Chen
4924a31b18 Fix phone account component name for voicemail status entries.
Currently was using toString(), switch to "flattenToString" so it is
consistent with the call log.

Bug: 20954214

Change-Id: Ia9ed67bf463e4a2d4d9a02e00243d49238be17fe
2015-05-21 13:05:41 -07:00
Leon Scroggins III
aba3ecb976 Merge "Fix overflow in NinePatchImpl." into mnc-dev 2015-05-21 19:05:46 +00:00
Deepanshu Gupta
bbb0ae13e2 Merge "Add documentation about hack in commit: f8ea750455" into mnc-dev 2015-05-21 18:59:31 +00:00
Selim Cinek
0cce531f2e Fixed a bug where a notification could get below the empty shade view
This lead to a temporary flash when a notification came in with
the empty shade view being visible.

Bug: 20972545
Change-Id: I2b06f63dd43bf53bb2d1da0cddb635a709663f71
2015-05-21 18:51:44 +00:00
Deepanshu Gupta
6330971ed2 Add documentation about hack in commit: f8ea750455
Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
2015-05-21 18:51:13 +00:00
Selim Cinek
f98702eae0 Protecting against the correct flag for the input consumer
Also allow hiding the navbar if immersive or immersivesticky.

Bug: 21089476
Change-Id: I540e668746056a0e4bb077898792afd225e4e19e
2015-05-21 18:49:27 +00:00
Craig Mautner
714b0ab4cb Merge "Add debug for bug 21055376." into mnc-dev 2015-05-21 18:34:32 +00:00
Luan Nguyen
82120b6180 am 5c7dcb30: am 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '5c7dcb3054bef13896631de04aa45fc77782a1c2':
  docs: Update the AlwaysOn sample link to point to DAC's samples
2015-05-21 18:26:34 +00:00
Eino-Ville Talvala
779d43a75b Merge "Camera2: Fix spelling mistake" into mnc-dev 2015-05-21 18:15:30 +00:00
Craig Mautner
4a3b824b23 Add debug for bug 21055376.
Change-Id: I1e93fb225f2639af031cdfa748a7898f31ad5a94
2015-05-21 11:12:51 -07:00
Luan Nguyen
5c7dcb3054 am 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '0e7fa9e32aecdd3d124828ac459ad6c14776c8e4':
  docs: Update the AlwaysOn sample link to point to DAC's samples
2015-05-21 18:12:35 +00:00
Eino-Ville Talvala
bd7f34f151 Camera2: Fix spelling mistake
Change-Id: I8c764d4c2ada34b126cb0097e8eefb710a08e310
2015-05-21 11:10:51 -07:00
Eino-Ville Talvala
842568eceb Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev 2015-05-21 18:09:40 +00:00
Santos Cordon
3dd9bbf8e7 Merge "Add intents for enabling phone accounts." into mnc-dev 2015-05-21 17:32:51 +00:00
Chad Brubaker
431eac49aa Merge "Cleanup Keystore API" into mnc-dev 2015-05-21 17:26:45 +00:00
Clara Bayarri
b5611f555d Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev 2015-05-21 17:24:14 +00:00
Narayan Kamath
6bd37924b6 Merge "Fix application moves." into mnc-dev 2015-05-21 17:23:17 +00:00