Commit Graph

48422 Commits

Author SHA1 Message Date
Dianne Hackborn
2d2e2e0cef am ad15bee4: am c60f010e: am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev
* commit 'ad15bee4ff4ead176d4e4fb06c7b579db9cf3cfa':
  Add API to track usage time of apps.
2015-05-22 01:50:16 +00:00
Selim Gurun
469290e23b am 7f34d973: am 53d3e8c9: am 95821eea: Merge "Clean remaining API related issues." into mnc-dev
* commit '7f34d973dbe3f39c63f787a43bb94d624eab03a7':
  Clean remaining API related issues.
2015-05-22 01:37:17 +00:00
Dianne Hackborn
ad15bee4ff am c60f010e: am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev
* commit 'c60f010edcb197451d087207b0c9527d74cff245':
  Add API to track usage time of apps.
2015-05-22 01:37:15 +00:00
Selim Gurun
7f34d973db am 53d3e8c9: am 95821eea: Merge "Clean remaining API related issues." into mnc-dev
* commit '53d3e8c93d3aec6f6ee9c9c759da3241fbaddb75':
  Clean remaining API related issues.
2015-05-22 01:24:48 +00:00
Dianne Hackborn
8b20cdb27b Merge "Add API to track usage time of apps." into mnc-dev 2015-05-22 01:12:44 +00:00
Selim Gurun
95821eeabc Merge "Clean remaining API related issues." into mnc-dev 2015-05-22 01:02:14 +00:00
Selim Gurun
98fe09cba0 Clean remaining API related issues.
Bug:21063767
Change-Id: Ifb6936699367b4cc1641b74c890856c0b51978d2
2015-05-21 17:56:58 -07:00
Filip Gruszczynski
ba785dfcbc am 76173cc8: am b0edb78e: am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
* commit '76173cc89f6a6499d82692ead1e38660f5f1deca':
  Support for devices with a chin.
2015-05-22 00:31:56 +00:00
Filip Gruszczynski
76173cc89f am b0edb78e: am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
* commit 'b0edb78e5cfd793ff7848b14962f1cf7ca509eff':
  Support for devices with a chin.
2015-05-22 00:23:41 +00:00
Craig Mautner
5b4837a2c4 am f41e2e63: am 4c20f59f: am 15dddf38: Merge "For getHomeActivity() only return current user." into mnc-dev
* commit 'f41e2e6391fa1c654ac4045652ae77e7c82a1597':
  For getHomeActivity() only return current user.
2015-05-22 00:13:22 +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
Craig Mautner
f41e2e6391 am 4c20f59f: am 15dddf38: Merge "For getHomeActivity() only return current user." into mnc-dev
* commit '4c20f59f76fc6a7c5c4dc3d6e3087395cf5686de':
  For getHomeActivity() only return current user.
2015-05-22 00:00:15 +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
Craig Mautner
15dddf3891 Merge "For getHomeActivity() only return current user." into mnc-dev 2015-05-21 23:40:27 +00:00
Nancy Chen
f6431d841e am d12eb353: am 3dd59bfb: am 769832d1: Merge "Fix phone account component name for voicemail status entries." into mnc-dev
* commit 'd12eb3531c38c8e222c386ec988df7359c81bf01':
  Fix phone account component name for voicemail status entries.
2015-05-21 22:40:39 +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
Nancy Chen
d12eb3531c am 3dd59bfb: am 769832d1: Merge "Fix phone account component name for voicemail status entries." into mnc-dev
* commit '3dd59bfb69472b13835a336c36e53d6726b5977a':
  Fix phone account component name for voicemail status entries.
2015-05-21 22:28:51 +00:00
Yohei Yukawa
44d6e19fb9 am 882dcd5a: am 9360da99: am c0a9cd44: Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev
* commit '882dcd5a40163342ea88e18f4597e6665da25237':
  Do not clear IMM#mCurRootView in IMM#finishInputLocked().
2015-05-21 22:28:51 +00:00
Yohei Yukawa
882dcd5a40 am 9360da99: am c0a9cd44: Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev
* commit '9360da997eb4eb2202fa0a3115f0bcfb2c4950f9':
  Do not clear IMM#mCurRootView in IMM#finishInputLocked().
2015-05-21 22:13:01 +00: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
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
Eino-Ville Talvala
674f1be784 am eda458c4: am d301a66b: am 779d43a7: Merge "Camera2: Fix spelling mistake" into mnc-dev
* commit 'eda458c4a51fce8288dc5ee7539025ce5a97af34':
  Camera2: Fix spelling mistake
2015-05-21 19:04:54 +00:00
Eino-Ville Talvala
29aaf50723 am 88092fe1: am 3df98a20: am 842568ec: Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev
* commit '88092fe1e2ea2e92bbc550786d324c996f10413e':
  Camera2: Fix CaptureRequest @see links
2015-05-21 19:04:49 +00:00
Clara Bayarri
601ab83968 am 99eff791: am aadd31ff: am b5611f55: Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev
* commit '99eff791df039bd0e43e9c82452ca383406dcfd9':
  Update the documentation for ActionMode.Callback2#onGetContentRect
2015-05-21 19:04:33 +00:00
Erik Kline
aa7c43c024 am f3c5a342: am 11b5ee05: am cd7ed16f: LinkProperties function to compare provisioning and remove DNS servers
* commit 'f3c5a3427ecfeea5e07649ab792bfc4af2c4b71a':
  LinkProperties function to compare provisioning and remove DNS servers
2015-05-21 19:03:12 +00:00
Eino-Ville Talvala
eda458c4a5 am d301a66b: am 779d43a7: Merge "Camera2: Fix spelling mistake" into mnc-dev
* commit 'd301a66b0d6e549375401575e2461924cb4f731e':
  Camera2: Fix spelling mistake
2015-05-21 18:49:41 +00:00
Eino-Ville Talvala
88092fe1e2 am 3df98a20: am 842568ec: Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev
* commit '3df98a20a00cb638f9a3264866c7f104aeef3980':
  Camera2: Fix CaptureRequest @see links
2015-05-21 18:49:35 +00:00
Clara Bayarri
99eff791df am aadd31ff: am b5611f55: Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev
* commit 'aadd31ffe26a393ed70a55ac9c47e0493157e5f1':
  Update the documentation for ActionMode.Callback2#onGetContentRect
2015-05-21 18:49:07 +00:00
Erik Kline
f3c5a3427e am 11b5ee05: am cd7ed16f: LinkProperties function to compare provisioning and remove DNS servers
* commit '11b5ee0541b5bdb06bebd3b024ce0645eb2c122a':
  LinkProperties function to compare provisioning and remove DNS servers
2015-05-21 18:43:13 +00:00
Eino-Ville Talvala
779d43a75b Merge "Camera2: Fix spelling mistake" into mnc-dev 2015-05-21 18:15:30 +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
Chad Brubaker
431eac49aa Merge "Cleanup Keystore API" into mnc-dev 2015-05-21 17:26:45 +00:00
Clara Bayarri
e95cc176bb Update the documentation for ActionMode.Callback2#onGetContentRect
Received feedback from a team that it was not clear what the rect
had to include.

Change-Id: I03ca54ee1092e8af3a2078c42104e1ce88490cd1
2015-05-21 17:45:19 +01:00
Keisuke Kuroyanagi
7c1b0e0e62 am 2c9bb079: am 56692dd7: am 27a63612: Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev
* commit '2c9bb079e7457fff39766e50240cc8af965ff3fb':
  Fix: Crash when modifying text while using drag accelerator.
2015-05-21 15:57:33 +00:00
Keisuke Kuroyanagi
2c9bb079e7 am 56692dd7: am 27a63612: Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev
* commit '56692dd72fb1e8b860be3dbd0ebe0037334bd8e2':
  Fix: Crash when modifying text while using drag accelerator.
2015-05-21 15:39:32 +00:00
Jim Miller
626f6432ae am ddfdfc49: am 60ce06db: am 0a17fb4e: Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
* commit 'ddfdfc494e41088ecaec783a48b9027188474b42':
  Move from native FingerprintService implementation to fingerprintd
2015-05-21 12:45:06 +00:00
Jim Miller
ddfdfc494e am 60ce06db: am 0a17fb4e: Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
* commit '60ce06db20b41fed23460e927f9a51ecaa5b1bee':
  Move from native FingerprintService implementation to fingerprintd
2015-05-21 12:22:14 +00:00
Erik Kline
cd7ed16f00 LinkProperties function to compare provisioning and remove DNS servers
Adds:
    - enum ProvisioningChange
    - LinkProperties#compareProvisioning()
          return a ProvisioningChange value describing the delta in
          provisioning between two LinkProperties objects
    - LinkProperties#removeDnsServer()
    - make "@hide public" isIPv4Provisioned() and isIPv6Provisioned()

Bug: 18581716
Change-Id: I3df90b2b89617f693346f2dbe72e77c88ce91ffd
2015-05-21 20:43:47 +09:00
Keisuke Kuroyanagi
27a6361234 Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev 2015-05-21 04:07:57 +00:00
Filip Gruszczynski
c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev
This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
2015-05-20 20:15:29 -07:00
Jim Miller
0a17fb4e56 Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev 2015-05-21 00:57:44 +00:00
Filip Gruszczynski
47249f2a9e am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
  Support for devices with a chin.
2015-05-20 22:54:14 +00:00
Selim Cinek
302462938d am ab0c2b2a: am 671426f4: am d3f216d9: Merge "Fixed that touches where incorrectly consumed when fullscreen" into mnc-dev
* commit 'ab0c2b2a415e7ffccc8d0e06466e24eb29ab2a52':
  Fixed that touches where incorrectly consumed when fullscreen
2015-05-20 22:48:06 +00:00
Selim Cinek
ab0c2b2a41 am 671426f4: am d3f216d9: Merge "Fixed that touches where incorrectly consumed when fullscreen" into mnc-dev
* commit '671426f486ac86501d2139e136a4dce08cbca98a':
  Fixed that touches where incorrectly consumed when fullscreen
2015-05-20 22:32:13 +00:00
Etan Cohen
e85a3e5458 am 33a95f93: am 14c60bb1: am 466503d0: Merge "Add Carrier Presence to CP2: Phone" into mnc-dev
* commit '33a95f93ca4856032eef804cfe97a798c6df6748':
  Add Carrier Presence to CP2: Phone
2015-05-20 22:30:20 +00:00
Selim Cinek
d3f216d921 Merge "Fixed that touches where incorrectly consumed when fullscreen" into mnc-dev 2015-05-20 22:21:38 +00:00
Selim Cinek
f83e824216 Fixed that touches where incorrectly consumed when fullscreen
The fake window that was added when View.SYSTEM_UI_FULL_SCREEN was
set consumed all touches, even those going to the SystemUI and not
just those of windows below. The input consumer is now correctly
positioned in the window order to only capture the right touches.
Clicks to the volume panel and the heads up now correctly go to the
right place instead of just unhiding the SystemUI bars.

Bug: 21089476
Change-Id: Ib53dfc0b33b70084ca607d0f044db30b6e6c91d6
2015-05-20 22:20:17 +00:00