148300 Commits

Author SHA1 Message Date
Svetoslav
bdbb6e0679 Merge "Update the "More options" button in printing." into lmp-dev 2014-08-21 00:16:54 +00:00
Svetoslav
3c238245eb Update the "More options" button in printing.
The "More options" button needed changes to match the
new UX spec. Also fixed some identation issues as well
as a missing marging in the erorr UI.

bug:16301066

Change-Id: I29f0d41915d1816d754f2c6288a7387aafeba2c2
2014-08-20 19:57:16 +00:00
Christian Robertson
46a8f45253 Merge "Updated set of geometric navigation bar icon assets" into lmp-dev 2014-08-20 18:43:12 +00:00
Christian Robertson
5455aa0f7b Updated set of geometric navigation bar icon assets
Bug: 15981688
Change-Id: Id56cafc17aaf86cd3ce1cc125197fa0ce86ab56b
2014-08-20 13:21:18 +00:00
RoboErik
47a7d247ef Merge "Api updates to MediaSession components" into lmp-dev 2014-08-19 02:43:23 +00:00
RoboErik
d2b8c947dd Api updates to MediaSession components
-renames get/setBufferPosition to get/setBufferedPosition
-renames getLaunchActivity to getSessionActivity
-adds doc link to setVolumeTo flags param
-renames setLaunchActivity to setSessionActivity
-hides setMediaRouter
-moves PLAYBACK_TYPE_ constants to MediaController.AudioInfo
-adds addOnActiveSessionsChangedListener version with a handler parameter
-renames AudioInfo to PlaybackInfo

bug:17114404
Change-Id: I0fbfe4eb979cb2af98e3f13095c654bb131f7ae5
2014-08-20 10:05:06 -07:00
vandwalle
da3475dba7 Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev 2014-08-20 16:06:26 +00:00
vandwalle
1575d90605 remove passpoint, except ANQP - DO NOT MERGE
This CL is dependend on Ic3ae7269f0ca11cec6b7aea5143499e88ecc7149

Change-Id: Ic533d1820c470bf2370a92452b37515ef7458f45
2014-08-19 01:54:41 +00:00
Jorim Jaggi
730e9bceb7 Merge "Make alarm invisible when going to detail in QS" into lmp-dev 2014-08-16 04:36:39 +00:00
Jorim Jaggi
aa6c364082 Make alarm invisible when going to detail in QS
Bug: 17058346
Change-Id: Id93eb150582799a3e258c839c056e0fa38259424
2014-08-20 16:59:51 +02:00
Nicolas Prevot
d26bfec44b Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev 2014-08-16 04:36:37 +00:00
John Spurlock
7fa31601a6 Merge "Copy framework internal resources for indeterminate anim." into lmp-dev 2014-08-20 12:26:29 +00:00
John Spurlock
06b7b61352 Copy framework internal resources for indeterminate anim.
Bug:14622065
Change-Id: Icfe4df5b01f342b7d3dc792e03391dc764abd59b
2014-08-20 11:44:45 -04:00
Santos Cordon
80030f90b6 Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev 2014-08-20 12:26:29 +00:00
Gabriel Peal
b95f169a74 Made all classes required for an InCallService @SystemApi
Bug: 17153048
Change-Id: I6b46969e976a47fd814022939a99b823fcb7b2bd
2014-08-20 16:08:53 +00:00
Nicolas Prevot
5ef7e19a0e Allow the system in other users to call startActivityAsCaller.
BUG: 17148852

Change-Id: I4c9811b7da90b5705e72001dd36bf67d559cb189
2014-08-20 11:09:29 +01:00
Igor Murashkin
3a6eba01c4 Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
517b74533a camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
Return empty array since no implementation-defined sizes are supported

Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
2014-08-19 10:51:30 -07:00
Igor Murashkin
ae0da7a81c Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 2014-08-19 02:43:23 +00:00
Lajos Molnar
d504ab14d2 media.MediaPlayer: don't check file-existence for URI-s with scheme
setDataSource can be called with URI-s as well as with file paths.
Check file-existence only for file:// URI-s as well as URI-s
without scheme (which are assumed to be paths).

Bug: 17109022
Change-Id: I70f16a4f614dcef0b47fa264cf708473036cef4e
2014-08-19 11:08:08 -07:00
Igor Murashkin
981952d07a camera2: (Legacy) Add control.sceneMode = DISABLED to templates
Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
2014-08-19 11:04:31 -07:00
RoboErik
a66c40bf6e Update MediaSession APIs for council feedback
-Changes MediaSessionManager.SessionsListener to OnActiveSessionsChangedListener
and makes it an interface.
-Renames MediaController.VolumeInfo to MediaController.AudioInfo
-Renames MediaSession.Track to MediaSession.Item

bug:17059552
Change-Id: I3a0b4371700ad6657972c312a5ab89ddfac6df5b
2014-08-19 17:12:42 +00:00
Chris Craik
f1381debec Merge "Respect round rect clip when determining op opaqueness" into lmp-dev 2014-08-19 15:47:37 +00:00
George Mount
7f15164ecb Add a way to get Transitions from a TransitionSet.
Bug 17113732

Change-Id: I0a157a59448e66560ba2252709971131c5dea401
2014-08-19 16:43:06 +00:00
Chris Craik
2262abbd16 Respect round rect clip when determining op opaqueness
bug:17115570
Change-Id: I30184b4678d333b5d222af8b61daa07a5e865cab
2014-08-18 19:55:36 -07:00
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
2014-08-18 16:53:27 +00:00
Jorim Jaggi
fe9c0a58aa Merge "Don't allow to scroll to QS if not provisioned" into lmp-dev 2014-08-16 04:36:37 +00:00
Jorim Jaggi
18bd04fdfe Don't allow to scroll to QS if not provisioned
Bug: 15593900
Change-Id: I54ae38f7f2c82e26b859ba7b7b3a5e096e18289e
2014-08-20 15:00:36 +02:00
Jorim Jaggi
3bf37725bd Merge "Fix accessibility actions for navigation bar" into lmp-dev 2014-08-16 04:36:39 +00:00
Jorim Jaggi
7beadfc714 Fix accessibility actions for navigation bar
Because we handle touch events with custom code, we also need to
handle accessibiltiy correctly.

Bug: 15938266
Change-Id: I186807b7349881a5f0804d7452974cc3c3a8a160
2014-08-20 14:51:06 +02:00
Selim Cinek
255dd04271 Added notification color to all system notifications
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
2014-08-20 14:25:18 +02:00
Wei Wang
a72dd6ba6f Merge "Fix race condition for BluetoothLeScanner." into lmp-dev 2014-08-16 04:32:18 +00:00
Christopher Tate
a555fd847c Merge "Maintain transport connection through package updates" into lmp-dev 2014-08-21 00:22:45 +00:00
Christopher Tate
b2707afb0c Maintain transport connection through package updates
When a package is updated, existing bindings to that package's
services are severed and must be manually re-established.  Now
that the transport can be updated outside the system per se,
make sure that we detect these cases and rebind as needed.

Bug 16139912

Change-Id: I5d6fa75bb86484f8f7d4f8e93c9157773995e6a7
2014-08-21 00:25:53 +00:00
Adam Powell
a900677a0b Merge "Fix measurement regression in ActionBarContainer" into lmp-dev 2014-08-21 00:16:54 +00:00
Adam Powell
635c21b061 Fix measurement regression in ActionBarContainer
Make sure that we take into account all child views (including
ActionBarContextViews) when measuring the action bar container to
determine the measurement influence of an additional tab bar.

Bug 16982971

Change-Id: I53ba7e9a4c9e36d97c6385d2007a3ee0a4e2bc77
2014-08-20 18:15:30 -07:00
Adam Powell
75f9918760 Merge "Unify code paths for collapsing action views in action bars" into lmp-dev 2014-08-21 00:16:54 +00:00
Adam Powell
5352a89e8a Unify code paths for collapsing action views in action bars
This reverts a well-intentioned bugfix that made
ActionBarOverlayLayout focusable in touch mode and caused issues with
some activity layouts. Removes the associated key handling code for
the Back key in ActionBarOverlayLayout and handles it at a higher
level in Activity instead. (This same code path was already in use by
ToolbarActionBar.)

Bug 17105724

Change-Id: I57e4cace44a6d11f25a2549644b565446d616a52
2014-08-20 17:33:24 -07:00
Lorenzo Colitti
827296b7dd Merge "Update state to failed if the VPN fails to connect." into lmp-dev 2014-08-21 00:11:43 +00:00
Guang Zhu
cf038760f2 Merge "fixes for connectivity manager test suite" into lmp-dev 2014-08-21 00:11:43 +00:00
Amit Mahajan
dbc6689664 Merge "Adding APIs to get IMEI/MEID" into lmp-dev 2014-08-21 00:16:54 +00:00
Chris Craik
2d84cdb414 Merge "Add bounds checking to nine patch scaling" into lmp-dev 2014-08-21 00:16:54 +00:00
Guang Zhu
d21f1c1e4d fixes for connectivity manager test suite
* reduced visibility of most util functions in
  ConnectivityManagerTestBase
* reimplemented various waitFor... util function in base class:
  instead of relying on received broadcast and synchronization
  mechanism, we just poll for what we want with a fixed interval
  and a max timeout
* minor style fixes
* removed state transition checks in all test cases of
  ConnectivityManagerMobileTest: since exact state transitions
  are not that interesting, we just care about if we reach a
  particular state and if all network interfaces are in their
  corresponding states
* clarified in comment what each test cases are testing, since
  some of the test case names are not very straightforward
* any wait for DISCONNECTED checkes with ConnectivityManager are
  temporarily commented out

Change-Id: I99cca95c33c6060909e0df684969b75c2dca23a9
2014-08-20 17:15:35 -07:00
Amit Mahajan
284f1ec16e Adding APIs to get IMEI/MEID
Change-Id: I553b7c019b20a64ff1049f35b0e3999ab82b7cce
2014-08-20 17:02:17 -07:00
Chris Craik
bd8db2e87e Add bounds checking to nine patch scaling
bug:17114103

Better handle the case, when scaling the divs in a nine patch, where
divs fall outside of the bounds of the bitmap.

Change-Id: I244b9c45b938c2a15f29e4563a86825ee9439b5f
2014-08-20 16:37:16 -07:00
Lorenzo Colitti
438406092e Update state to failed if the VPN fails to connect.
Without this, the VPN settings dialog stays in "Connecting..."
forever.

Bug: 17140195
Change-Id: I4771be464384b62114839523fb2a6b36aa6520ee
2014-08-20 16:01:44 -07:00
Diego Pontoriero
3f38f72a1b Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev 2014-08-20 21:47:20 +00:00
Jae Seo
3acf66f558 Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev 2014-08-19 21:23:09 +00:00
Alan Viverette
b19fe38840 Merge "Update toggle switch asset to include content area" into lmp-dev 2014-08-19 22:53:25 +00:00
Alan Viverette
a5e1301bf5 Update toggle switch asset to include content area
Remove optical bounds workaround from NinePatchDrawable, which was
incorrect anyway since we were missing a content area rather than
missing padding.

BUG: 17114103
Change-Id: I51461be666f59534dfdea7ab79bc867ee3eb3c92
2014-08-19 16:55:47 -07:00