Commit Graph

52186 Commits

Author SHA1 Message Date
Chris Craik
0b9c3abbe3 am 33416a93: Merge "Disable density scaling for HW canvas" into mnc-dev
* commit '33416a9363a8d78bf10818d40806085a4d1ba311':
  Disable density scaling for HW canvas
2015-05-22 18:07:14 +00:00
Chris Craik
33416a9363 Merge "Disable density scaling for HW canvas" into mnc-dev 2015-05-22 17:57:08 +00:00
Chris Craik
9c08ee0f6c Disable density scaling for HW canvas
bug:20692121

Change-Id: Ief4514ba55857e183fa281f28e5aceac08d51990
2015-05-22 10:49:48 -07:00
Fyodor Kupolov
12c62ee284 am 96616a57: Merge "Use factory methods for RestrictionEntry" into mnc-dev
* commit '96616a57f3af05d4808fb5b84e758000f6ab5372':
  Use factory methods for RestrictionEntry
2015-05-22 16:37:49 +00:00
Fyodor Kupolov
96616a57f3 Merge "Use factory methods for RestrictionEntry" into mnc-dev 2015-05-22 16:21:20 +00:00
Clara Bayarri
b2eb4ddaa1 am ae0940fe: Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev
* commit 'ae0940fe754b7aba552b4a5cd616df052606ccd1':
  Update the PROCESS_TEXT action javadoc to include types
2015-05-22 10:33:55 +00:00
Clara Bayarri
ae0940fe75 Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev 2015-05-22 10:24:57 +00:00
Erik Kline
bfb01502b1 am 2dcba49c: Merge "Notify only on loss of provisioning." into mnc-dev
* commit '2dcba49caf114dd24ffc1c26a11683c5cb21e3ff':
  Notify only on loss of provisioning.
2015-05-22 04:29:43 +00:00
Erik Kline
2dcba49caf Merge "Notify only on loss of provisioning." into mnc-dev 2015-05-22 04:22:04 +00:00
Erik Kline
b1eebaeb92 Notify only on loss of provisioning.
Lots of code refactoring, include:
    - no longer watch for on-link proxies (only routers and DNS servers)
    - keep track of NUD state of neighbors of interest

Bug: 18581716
Change-Id: Ia7dbef0690daf54f69ffecefc14e1224fd402397
2015-05-22 13:03:08 +09:00
Keisuke Kuroyanagi
30dadafe67 am 1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev
* commit '1733bd3defde7818940d72dac95bb18fb8d70b22':
  Fix: Insertion handle can be moved just by tapping.
2015-05-22 02:41:20 +00:00
Keisuke Kuroyanagi
1733bd3def Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev 2015-05-22 02:28:26 +00:00
Dianne Hackborn
c890f25a45 am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev
* commit '8b20cdb27bc5b4c433c4fc650203be9a25842bbd':
  Add API to track usage time of apps.
2015-05-22 01:24:58 +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
aa69c80f89 am 95821eea: Merge "Clean remaining API related issues." into mnc-dev
* commit '95821eeabc1d6ae07ed2c3e6763f17473fb32ae3':
  Clean remaining API related issues.
2015-05-22 01:11:58 +00:00
Selim Gurun
95821eeabc Merge "Clean remaining API related issues." into mnc-dev 2015-05-22 01:02:14 +00:00
Etan Cohen
109e9c449d Merge commit '93bbf27' into merge 2015-05-21 17:59:49 -07:00
Etan Cohen
6cb5fcaad1 Merge commit '35105ee7' into merge 2015-05-21 17:58:25 -07:00
Selim Gurun
98fe09cba0 Clean remaining API related issues.
Bug:21063767
Change-Id: Ifb6936699367b4cc1641b74c890856c0b51978d2
2015-05-21 17:56:58 -07: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
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
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
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
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
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
92c8e6f4a3 Update the PROCESS_TEXT action javadoc to include types
Bug: 21343771
Change-Id: If1d64ba121555863022cecc7a7b3d94c866e8715
2015-05-21 17:58:27 +01: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
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
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
Jim Miller
be67542182 Move from native FingerprintService implementation to fingerprintd
This adds a new service, fingerprintd, that manages fingerprint
hardware from a separate process.  It provides a binder interface that
FingerprintManager uses to talk to the fingerprint HAL.

Change-Id: I84d8e407c1f1a7d1a396e246c382459ad38810ae
2015-05-20 14:56:06 -07:00
Etan Cohen
466503d0bd Merge "Add Carrier Presence to CP2: Phone" into mnc-dev 2015-05-20 21:38:07 +00:00
Filip Gruszczynski
3e11bf33a6 Support for devices with a chin.
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.

Bug: 19908853

Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
2015-05-20 14:20:30 -07:00
fenglu
22c228f203 Merge "LCE feature enhancement" into mnc-dev 2015-05-20 21:09:09 +00:00
Ruben Brunk
f082bb2a7f Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev 2015-05-20 20:44:28 +00:00
Svet Ganov
084110bd39 Merge "Allow DO/PO to go back to normal permission state." into mnc-dev 2015-05-20 20:09:38 +00:00
Svet Ganov
d8ecc5aee4 Allow DO/PO to go back to normal permission state.
We have APIs for a DO/PO to fix a permission in a granted or
denied state in which the user cannot manage this permission
through the UI. However, there is no way to go back to the
default state in which the user gets to choose the permission
grant state.

Change-Id: I2562a1d8b1385cd740b44812844ef14c895c2902
2015-05-20 13:08:58 -07:00
Jorim Jaggi
52a66ae41c Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev 2015-05-20 19:01:53 +00:00
Mady Mellor
b300d31bf1 Merge "Text selection: fix some issues with drag accelerator" into mnc-dev 2015-05-20 18:05:32 +00:00