Commit Graph

52363 Commits

Author SHA1 Message Date
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
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
Etan Cohen
33a95f93ca am 14c60bb1: am 466503d0: Merge "Add Carrier Presence to CP2: Phone" into mnc-dev
* commit '14c60bb126f00435647d466f730449d3cfa6457f':
  Add Carrier Presence to CP2: Phone
2015-05-20 22:06:44 +00:00
fenglu
bd5a06452b am ffb4b83a: am 22c228f2: Merge "LCE feature enhancement" into mnc-dev
* commit 'ffb4b83a8e6a6d2236151f61cabfa6bdb453e219':
  LCE feature enhancement
2015-05-20 21:48:46 +00:00
Etan Cohen
466503d0bd Merge "Add Carrier Presence to CP2: Phone" into mnc-dev 2015-05-20 21:38:07 +00:00
Ruben Brunk
e1d803124d am a7b9822e: am f082bb2a: Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev
* commit 'a7b9822e0f16a54bae1ed9c798e2fe49218ed8ab':
  camera: Add AIDL interface for CameraServiceProxy.
2015-05-20 21:11:46 +00: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
393c80cfdc am b39fb08b: am 084110bd: Merge "Allow DO/PO to go back to normal permission state." into mnc-dev
* commit 'b39fb08b6274559140617e1e1ed615cd18500476':
  Allow DO/PO to go back to normal permission state.
2015-05-20 20:34:10 +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
529df4ffc8 am 112f328f: am 52a66ae4: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev
* commit '112f328f2d6f5ca1ace4bdfbac3dd388018b48da':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)
2015-05-20 19:20:14 +00:00
Jorim Jaggi
52a66ae41c Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev 2015-05-20 19:01:53 +00:00
Mady Mellor
1f25f1d75d am 46b70388: am b300d31b: Merge "Text selection: fix some issues with drag accelerator" into mnc-dev
* commit '46b7038811259a22c5494c0420185836cc4d3e76':
  Text selection: fix some issues with drag accelerator
2015-05-20 18:38:35 +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
Brian Attwell
258a6b62e6 am afe2b09c: am 7d383b92: Hide ProviderStatus and Authentication APIs
* commit 'afe2b09ccfca74dcebffa1c8d751e96b5bd1be44':
  Hide ProviderStatus and Authentication APIs
2015-05-20 17:54:24 +00:00
Mady Mellor
b340eecd7d am 88b07740: am 3244a663: Merge "Fix selection handles on older API versions" into mnc-dev
* commit '88b077407ca0afb735a19191cfc553379efa8d58':
  Fix selection handles on older API versions
2015-05-20 17:54:18 +00:00
Brian Attwell
7d383b9271 Hide ProviderStatus and Authentication APIs
Bug: 21090207
Change-Id: I27b604b9c849e1aad8289c517f5e50c5d0faae0f
2015-05-20 17:28:35 +00:00
Mady Mellor
3244a66336 Merge "Fix selection handles on older API versions" into mnc-dev 2015-05-20 17:09:13 +00:00
Mady Mellor
7a93644d5e Text selection: fix some issues with drag accelerator
Couple of overlapping issues that this CL fixes. The major change is to
offset the selection vertically this is similar to how the handles work
already (i.e. touch target is below what's being selected), and still
allows the user to see the selection start / end without covering it with
their finger.

This change fixes multiple issues:
1) Previously to ensure the finger wasn't covering the selection a
   preceding or following offset was taken, this made it difficult to
   select certain words and it made text on the edge of the screen hard
   to select (b/21098345 and b/19965619)
2) The use of preceding and following on the word iterator was not correct
   allowing grapheme clusters to be split, now the offset is calculated
   with getWordStart/End which respect grapheme clusters (b/21045116)

Bug: 21098345
Bug: 21045116
Bug: 19965619
Change-Id: Id8392426cce20ad0ff47a4279c92f6ed1b0ad30e
2015-05-20 10:05:52 -07:00
John Reck
a7455b638e am 198a2b02: am 97bf518f: Merge "Reduce wasted buffer allocations" into mnc-dev
* commit '198a2b02f0b9f657f0c56fc067dabf15ed29d3ef':
  Reduce wasted buffer allocations
2015-05-20 14:41:11 +00:00
John Reck
b2d91b7f6a am a420e3ad: am 4430f16c: Merge "Fix whitespace in TextureView" into mnc-dev
* commit 'a420e3ad0fc92501c7744a462c7d4e531f1d5117':
  Fix whitespace in TextureView
2015-05-20 14:41:06 +00:00
John Reck
be9a31903e am 10a024bf: am 35e04a1a: Merge "Fix NPE in setSurfaceTexure" into mnc-dev
* commit '10a024bf45ed079b32dc4973147c5a47ad9db51c':
  Fix NPE in setSurfaceTexure
2015-05-20 14:41:00 +00:00
Dan Sandler
6e53d7ef75 am 2f99ca32: am 90ac386b: Merge "Deal more gracefully with null smallIcons." into mnc-dev
* commit '2f99ca32dbd29b3281b8464133f741c58f8ed05c':
  Deal more gracefully with null smallIcons.
2015-05-20 14:28:16 +00:00
John Reck
97bf518f7b Merge "Reduce wasted buffer allocations" into mnc-dev 2015-05-20 14:23:24 +00:00
John Reck
4430f16ced Merge "Fix whitespace in TextureView" into mnc-dev 2015-05-20 14:22:59 +00:00
John Reck
35e04a1adf Merge "Fix NPE in setSurfaceTexure" into mnc-dev 2015-05-20 14:22:41 +00:00
John Reck
5ba09488d6 Fix whitespace in TextureView
Change-Id: I22396b7205dc2b9cf0eda5bd8aa951cad8d8bd87
2015-05-20 07:21:51 -07:00
John Reck
8bc511e4eb Fix NPE in setSurfaceTexure
Bug: 20088412
Change-Id: I9b78636a7d89438c8924bb1bf2adba00e74366eb
2015-05-20 07:21:44 -07:00
Dan Sandler
90ac386b4e Merge "Deal more gracefully with null smallIcons." into mnc-dev 2015-05-20 14:04:36 +00:00
Dan Sandler
3936e7a6fb Deal more gracefully with null smallIcons.
First, when parceling a notification with no small icon:
Well, you shouldn't attempt to do this anyway, since NoMan
will reject a notification without a valid smallIcon.  But
setServiceForeground parcels up the Notification on its own
before handing it off to NoMan, so it will crash on an
invalid small icon. (In general, parceling code should never
ever crash, even if the object is in an undesirable state.)

And when build()ing a notification: Same thing---don't build
a notification with no icon; you're going to have a bad
time. But maybe you're going to fix it before you hand it
off to NoMan. Or maybe it's just one page of a wearable
notification, so it doesn't really need its own icon. Either
way, Notification shouldn't crash.

Bug: 21286186
Bug: 21298403
Change-Id: Ie482cde0a3afe3aaabf07be0536551b8e4bceba0
2015-05-20 10:00:54 -04:00
Paul Jensen
d3a56eda9d am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev
* commit '886ab256447f26fc21dfd328e070a11bcfd06374':
  Undeprecate android.net.ProxyInfo as it's still used.
2015-05-20 11:07:34 +00:00
Paul Jensen
cb7c035081 Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev 2015-05-20 10:49:04 +00:00
Andrei Stingaceanu
a53349dd55 am 886e9478: am 8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev
* commit '886e9478f53d62bdcf70302e4c3daa23afde9f5e':
  Landscape extracted mode - floating toolbar interference
2015-05-20 10:00:30 +00:00
Erik Kline
1fe1190821 am f9855b64: am 6f611d72: Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev
* commit 'f9855b642c0d1cb5a93a9287a6a9b0e1b560792c':
  Set NLM_F_ACK in our RTM_NEWNEIGH requests
2015-05-20 09:52:04 +00:00
Andrei Stingaceanu
8c44e74524 Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev 2015-05-20 09:32:50 +00:00
Andrei Stingaceanu
975a8d0f4d Landscape extracted mode - floating toolbar interference
In landscape do not allow starting selection modes if the
extracted mode has not yet started. Also remove the single
tap selection delayed runnable.

This allows for a smooth transition (as in no floating
toolbar artifacts) into extracted mode. Also fixes
(more as in hides) the double selections.

Bug: 20930071
Change-Id: Idb9c375dc25777761b11ca17ccfd9f5eedc642b4
2015-05-20 10:31:19 +01:00
Lorenzo Colitti
d59c3e9531 am 485826b2: am 4b545dfb: Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev
* commit '485826b2655836e6aa5cae10effe3bedca3d77d2':
  Add a hidden method to clear the capabilities of a NetworkRequest
2015-05-20 08:20:33 +00:00
Erik Kline
6f611d7267 Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev 2015-05-20 08:05:22 +00:00
Erik Kline
cef7bc939f Set NLM_F_ACK in our RTM_NEWNEIGH requests
With NLM_F_ACK set in RTM_NEWNEIGH requests we get some response from
the kernel, whether there was an error or not.

Additionally:

    [1] add IpReachabilityMonitor#probeNeighbor() as a public
        static method, since it actually depends very little on the
        class internals and might be of larger use.

    [2] add a unittest for parsing NetlinkErrorMessages.

Bug: 18581716
Change-Id: I5d62e7a9972c7440f0483c38c77677436d3a1a25
2015-05-20 16:46:30 +09:00
Erik Kline
ba510e65b6 am d1e4c154: am 77b01b88: Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev
* commit 'd1e4c154b57c1aa972a9f96ab59dec6c76413a80':
  Close netlink socket when shutting down IpReachabilityMonitor
2015-05-20 07:01:53 +00:00
Lorenzo Colitti
4b545dfbcd Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev 2015-05-20 05:49:03 +00:00
Erik Kline
abd3142dca Close netlink socket when shutting down IpReachabilityMonitor
This forces the NetlinkSocketObserver thread to exit quickly, rather
than lingering until the next random netlink neighbor multicast message
arrives.

Additionally, add a small unittest to verify that multiple calls to
NetlinkSocket#close() are safe.

Change-Id: I101730fad7eee72f9c6e8a7e7bd10c634f2ceab4
2015-05-20 12:08:55 +09:00
Yigit Boyar
08cec07f8e am 3c9b4bb2: am bf6d1ebc: am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '3c9b4bb278c268129a070dd75a58a26b5372d985':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
2015-05-20 00:47:15 +00:00
Ruben Brunk
6664aee15a camera: Add AIDL interface for CameraServiceProxy.
- Adds an AIDL interface to allow the proxy camera service
  running in system server to accept RPCs from the camera
  service running in mediaserver.
- Request an update to the valid user set from the proxy
  camera service when mediaserver restarts to initialize
  properly + avoid DOS after a crash.

Bug: 21267484
Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
2015-05-19 17:20:24 -07:00
fenglu
95ce803da7 LCE feature enhancement
- space pollLceData calls every 500ms
- cluster multiple pending pollLceData calls into one
- cherry pick from mwd to mnc-dev

Bug: 21307957
Change-Id: I04513011db3ae29af02bd54fe91cb8e0d4ab9f12
2015-05-19 17:08:00 -07:00
Yigit Boyar
bf6d1ebc4b am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '9b7167937ab5ea456c45e735d3bd749ccf49c432':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
2015-05-19 23:15:48 +00:00
Wei Wang
8c4bad200c am 78011ba9: am de35f0d9: Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev
* commit '78011ba9db257e7ae0bc06d49104c6f4bebc799e':
  setCallbackType should be public for onlost/onfound apis
2015-05-19 23:03:11 +00:00
Jeff Sharkey
43cafdc775 am 2d5d8926: am 891230b5: Merge "Push initial disk state, handle empty media." into mnc-dev
* commit '2d5d8926eab83d80994c559c2128ca591d41237c':
  Push initial disk state, handle empty media.
2015-05-19 23:03:06 +00:00