Commit Graph

39420 Commits

Author SHA1 Message Date
Alan Viverette
acc2c07b24 am ae1970d9: am 48286f82: Merge "Add API for obtaining max text length for accessibility" into lmp-dev
* commit 'ae1970d95d09d717fb795bbc23906d4b4e1503ee':
  Add API for obtaining max text length for accessibility
2014-08-13 00:39:28 +00:00
Jon Miranda
54ff3c7994 am 2a964260: am fbdf212c: Merge "Changed flow in export methods to continue through the loop if it encounters an int[] return type." into lmp-dev
* commit '2a964260d15538d9ce38c861dd673a6065cbf6a3':
  Changed flow in export methods to continue through the loop if it encounters an int[] return type.
2014-08-13 00:07:07 +00:00
Dake Gu
f08e085110 am ec060c4d: am ab841b08: Merge "fix ghost clipBounds problem" into lmp-dev
* commit 'ec060c4d993dec3c8f01995202c89438ae33466e':
  fix ghost clipBounds problem
2014-08-13 00:02:44 +00:00
Alan Viverette
f2546bf423 Merge "Add API for obtaining max text length for accessibility" into lmp-dev 2014-08-12 23:14:35 +00:00
Jon Miranda
177f08e593 Merge "Changed flow in export methods to continue through the loop if it encounters an int[] return type." into lmp-dev 2014-08-12 23:14:35 +00:00
Dake Gu
aa2474d50a Merge "fix ghost clipBounds problem" into lmp-dev 2014-08-12 23:14:35 +00:00
Dake Gu
0017ef9ee1 fix ghost clipBounds problem
OverlayViewGroup clipChildren=true, so that RenderNode
of GhostView will be forced clip its content to its bounds.
Because GhostView is transformed to a different location
other than (0,0),  the content left/up to the bounds
is clipped out.

Introduce another clipChildren=false view between
OverlayViewGroup and GhostView.

b/16982904

Change-Id: Ia11926c78e19bffe80c3d4584a59b83b2fbee6df
2014-08-12 16:10:40 -07:00
Jon Miranda
4852021095 Changed flow in export methods to continue through the loop if it encounters
an int[] return type.

There are two such instances:

1. "private int[] mRules" within RelativeLayout LayoutParams.
2. "public int[] getLocationOnScreen" in View.

When I added #2, we noticed missing annotated fields/methods in Hierarchy
Viewer, but #1 also caused the same issue (mainly not exporting
alignWithParent field)

Bug: 16844914
Change-Id: I0d83a4391aa0565897cd7f0523995c97b7a4976d
2014-08-12 15:45:57 -07:00
Alan Viverette
3721ddaeba am 4228599b: am a83c2f37: Merge "Use correct checked value when animating Switch" into lmp-dev
* commit '4228599b827cfa8c5b6ac4dd5152d7fec5dd2790':
  Use correct checked value when animating Switch
2014-08-12 22:41:09 +00:00
Alan Viverette
86e3818c67 am fdd3ba24: am c613ba38: Merge "Invalidate root render node when accessibility focus moves" into lmp-dev
* commit 'fdd3ba24157a4be97d2edef2e906dc35f8dfa4aa':
  Invalidate root render node when accessibility focus moves
2014-08-12 22:25:30 +00:00
Alan Viverette
029942f77d Add API for obtaining max text length for accessibility
BUG: 16736956
Change-Id: I15ffb9bf68e074adf3e0dbcd230367e115c03e3c
2014-08-12 14:55:56 -07:00
Jorim Jaggi
41e9efa97a am 4620b0b7: am f9205cbe: Preparations for lockscreen launch animations
* commit '4620b0b7dda38619bc1e68ce664907ee57e9d621':
  Preparations for lockscreen launch animations
2014-08-12 21:03:15 +00:00
Jorim Jaggi
76a1623afc Preparations for lockscreen launch animations
- Update unlock animations to new spec to make the consistent with
  lockscreen launch animations.
- Introduce disappearing motion for security views which runs before
  we actually dismiss Keyguard.
- If a window is running the un-force-hide animation, treat as it
  would have the wallpaper flag set so the wallpaper stays until
  the animation is completely done.
- Run an animation on the wallpaper if the wallpaper is going away.

Bug: 15991916
Bug: 16234603
Bug: 15326120
Change-Id: I063aa4f269ddcf75b9a705e90f0c3056b541b642
2014-08-12 20:52:26 +00:00
Alan Viverette
5454bc19d8 Merge "Use correct checked value when animating Switch" into lmp-dev 2014-08-12 19:31:43 +00:00
Alan Viverette
467d629ca7 Use correct checked value when animating Switch
BUG: 16984959
Change-Id: I1b4ffea568619663e26c097a28b86579d090c0ce
2014-08-12 15:13:19 -07:00
Alan Viverette
99421aed1f Merge "Invalidate root render node when accessibility focus moves" into lmp-dev 2014-08-12 19:31:43 +00:00
John Reck
8f22aec6fd am 899c474a: am 549975dc: Merge "Don\'t use libhwui to draw starting window" into lmp-dev
* commit '899c474a95bbd92aae0985c84d7a636c3f3a7bf1':
  Don't use libhwui to draw starting window
2014-08-12 18:26:57 +00:00
John Reck
015cb5dc71 Merge "Don't use libhwui to draw starting window" into lmp-dev 2014-08-12 18:13:56 +00:00
John Reck
1dd0e0fae2 Don't use libhwui to draw starting window
Bug: 16735410

Change-Id: I763c10b9d34eadcb768ad580d2387b1e825cbd53
2014-08-12 11:13:31 -07:00
Jean-Michel Trivi
c2790fe041 am 47aea2a3: am 6fdf173c: Merge "HDMI plug intent and associated information" into lmp-dev
* commit '47aea2a3340ace3f65e9f5c5344f054e1e5ab99c':
  HDMI plug intent and associated information
2014-08-12 17:59:40 +00:00
Brian Attwell
f62b822719 am 51e8757f: am c136287a: Merge "Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP" into lmp-dev
* commit '51e8757f9a19e5235e9082ed62fa7ea48e2470b2':
  Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP
2014-08-12 17:59:35 +00:00
Jean-Michel Trivi
bab0111ef0 Merge "HDMI plug intent and associated information" into lmp-dev 2014-08-12 16:54:46 +00:00
Jean-Michel Trivi
37d7804627 HDMI plug intent and associated information
Read HDMI device information from audio ports and add it as
 extras in the connection intent.
Document the new extras in the connection intent.
Make Intent.ACTION_HDMI_AUDIO_PLUG public.

Bug 10549017

Change-Id: I6236b5363f00c433e443195fae8c43af2fc834f7
2014-08-12 17:16:30 +00:00
Robin Lee
1aec14ec39 am a4ca4bc5: am 40bdb1f7: Clean up DevicePolicyManager CA certificate APIs
* commit 'a4ca4bc5a6763d4267c94a2701e1eb7073c886ea':
  Clean up DevicePolicyManager CA certificate APIs
2014-08-12 16:08:08 +00:00
Robin Lee
7e67871174 Clean up DevicePolicyManager CA certificate APIs
For consistency all CA-related methods now require the ComponentName
of a DeviceAdminReceiver as the first parameter. Updated javadoc for
this and added in some more detail about the methods in general as
well.

Created two new utility APIs,one to list all installed CAs and one to
remove all installed (user) CAs. Deleted old hasAnyCaCertsInstalled
method because it is now redundant.

@bug 16488006

Change-Id: I55eec17e01489ab323f8a0e68b11592605a7b740
2014-08-12 16:54:40 +01:00
George Mount
b0ce72900e am 76369ebe: am 0fb5d38b: Merge "Pass elevation to enable shadow in shared elements." into lmp-dev
* commit '76369ebe27f4b2f6365d5ee4431c6116e159f028':
  Pass elevation to enable shadow in shared elements.
2014-08-12 14:44:00 +00:00
George Mount
8d2ba6dac3 Merge "Pass elevation to enable shadow in shared elements." into lmp-dev 2014-08-12 04:17:55 +00:00
Jeff Davidson
5ad421163a am 2aea28cf: am b44d70ab: Merge "Security-related cleanup for network scoring." into lmp-dev
* commit '2aea28cf9aa66a2b00658e630a6c37b40d413806':
  Security-related cleanup for network scoring.
2014-08-12 03:48:31 +00:00
Barnaby James
0f82aa46fa am 9c15bfbf: am 475b1098: Merge "Fix VoiceInteractionService.isActiveService()." into lmp-dev
* commit '9c15bfbf9083b44e79d5b38b6ec72b5af3cde4be':
  Fix VoiceInteractionService.isActiveService().
2014-08-12 02:49:19 +00:00
Jeff Sharkey
8ca77718bf am 73cb9575: am dd28d64f: Merge "Hack and ship: NetworkStats edition." into lmp-dev
* commit '73cb9575b6417243cc7ff924b694d4a6134ac726':
  Hack and ship: NetworkStats edition.
2014-08-12 02:43:32 +00:00
Jeff Davidson
328e679b21 Merge "Security-related cleanup for network scoring." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Sharkey
eb2c2c790c Hack and ship: NetworkStats edition.
Some devices use clatd for catching raw IPv4 traffic when running on
a pure-IPv6 carrier network.  In those situations, the per-UID
stats are accounted against the clat iface, so framework users need
to combine both the "base" and "stacked" iface usage together.

This also means that policy rules (like restricting background data
or battery saver) need to apply to the stacked ifaces.

Finally, we need to massage stats data slightly:

-- Currently xt_qtaguid double-counts the clatd traffic *leaving*
the device; both against the original UID on the clat iface, and
against UID 0 on the final egress interface.

-- All clatd traffic *arriving* at the device is missing the extra
IPv6 packet header overhead when accounted against the final UID.

Bug: 12249687, 15459248, 16296564
Change-Id: I0ee59d96831f52782de7a980e4cce9b061902fff
2014-08-11 18:40:23 -07:00
Jinsuk Kim
fe2914f9b5 am e21ac05c: am b0f3440c: Merge "Move input change event handling out of TVInputManager" into lmp-dev
* commit 'e21ac05c8100c44771b447c999c028e0948b6d9e':
  Move input change event handling out of TVInputManager
2014-08-11 23:50:25 +00:00
George Mount
5f21c32522 am a4854090: am 6a2026dc: Merge "Custom snapshot capture and reconstitution." into lmp-dev
* commit 'a4854090af88d6628f826571d2617f60642f30ff':
  Custom snapshot capture and reconstitution.
2014-08-11 23:17:16 +00:00
Jeff Davidson
ac7285dc1e Security-related cleanup for network scoring.
-Perform additional checks for the SCORE_NETWORKS permission when
broadcasting scoring requests to the active scorer and when accepting
score updates. In theory, these checks are unnecessary as we manually
check package manager when obtaining the list of valid scorers, but
they cannot hurt to add.

-Fix multi-user. Since the active scorer is a global setting, we
ensure that scoring can only be done by apps available to the primary
user / owner of the phone, and that the request scores broadcast is
sent to that user's profile. When the scorer is changed, we send that
to all user profiles as it's just informational, although it's
unlikely that apps outside the primary user's profile would need to
respond.

Bug: 14117916
Bug: 16399238
Change-Id: Iaf06bda244eec730b590a30a3f4ffab4965bde96
2014-08-11 15:46:20 -07:00
George Mount
26c82b6ed1 Pass elevation to enable shadow in shared elements.
Bug 15932772

Change-Id: Ia4cb89035244656a2dd24936bf0e36a5b7970ea6
2014-08-11 15:38:56 -07:00
Alan Viverette
f6cf1a0253 Invalidate root render node when accessibility focus moves
BUG: 16796647
Change-Id: Ibfc6ec4aa50c6354ea095a35470dd54e768d911b
2014-08-11 14:13:02 -07:00
Igor Murashkin
36a0807a8c am 58046d50: am 81d6f3e5: camera2: (legacy) Fix the comparison for fixed-focus cameras
* commit '58046d50b68f58bb2d98cdcec68068af68837913':
  camera2: (legacy) Fix the comparison for fixed-focus cameras
2014-08-11 20:37:14 +00:00
Igor Murashkin
29188adb72 am fb534824: am 66a77b72: camera: (LEGACY) - Add captureIntent and physicalSize metadata
* commit 'fb5348247bb48f29c0d4eb1d26344edda778e6dc':
  camera: (LEGACY) - Add captureIntent and physicalSize metadata
2014-08-11 20:37:09 +00:00
Igor Murashkin
58c13f6430 am 1a3064dc: am b23dea98: camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
* commit '1a3064dce009482d3b14d949be87c6d38ab7c5ba':
  camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
2014-08-11 20:37:05 +00:00
Igor Murashkin
d42a5fd3e7 camera2: (legacy) Fix the comparison for fixed-focus cameras
* Use #equals instead of == for string comparison
* Also make sure lens.info.minimumFocusDistance shows up in
  CameraCharacteristics#getKeys() for fixed-focus cameras

Bug: 16900875
Change-Id: I3b9248c5cb62ddcfb13587c6349525e145e353ac
2014-08-11 13:25:01 -07:00
Igor Murashkin
7336f470e3 camera: (LEGACY) - Add captureIntent and physicalSize metadata
Bug: 16900182
Change-Id: I159f2416da71c2d7ea803d61b63476da90e03b1c
2014-08-11 13:25:01 -07:00
Igor Murashkin
8c4486c141 camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
Bug: 16898478
Change-Id: I4306f6380ea06e8bd95af8738e5dde1a42a8098c
2014-08-11 13:25:01 -07:00
Jinsuk Kim
91e25eda41 Merge "Move input change event handling out of TVInputManager" into lmp-dev 2014-08-11 19:42:53 +00:00
Jinsuk Kim
d38bf476f6 Move input change event handling out of TVInputManager
HDMI input change event should be handled best in TIS implementation
of HDMI input since the input change request from TV/other device
needs to be properly coordinated. This requires the listener be
moved the input service.

Provided an interface in HdmiTvClient for the input service to access
the API through getSystemService(Context.HDMI_CONTROL_SERVICE).

Conflicts:
	services/core/java/com/android/server/tv/TvInputHardwareManager.java

Bug: 15570939
Change-Id: Ie2ad10d77907de3d4501f9c892ca553b75365467
2014-08-12 08:27:32 +09:00
Brian Attwell
9401042e46 Merge "Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP" into lmp-dev 2014-08-11 18:48:29 +00:00
Brian Attwell
9ee66404b7 Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP
Since launchMode=singleTop is broken in the framework.

Bug: 16519102
Change-Id: I136821ab9d4493c51f03332cee1e3924a1bd361b
2014-08-12 06:03:41 +00:00
Barnaby James
2bed283743 Merge "Fix VoiceInteractionService.isActiveService()." into lmp-dev 2014-08-11 18:14:57 +00:00
Barnaby James
e2c020a449 Fix VoiceInteractionService.isActiveService().
Change-Id: Ifda467bfae0d15fe4ea0fd15ffc0e9612401b218
2014-08-11 15:29:12 -07:00
George Mount
480ca829e2 Custom snapshot capture and reconstitution.
Bug 16865996
Bug 14450297
Bug 16866642

Added a mechanism for custom capture and restore of snapshot
Views. By default, it captures a Bitmap and restores a View
using that Bitmap as a background.

Change-Id: I77c2c62df53b552872e467380565bbe0e6d5c114
2014-08-11 14:28:45 -07:00