drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
148,274 Commits 1 Branch 0 Tags
Commit Graph

148274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
vandwalle
da3475dba7 Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev 2014-08-20 16:06:26 +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
Jae Seo
47b9e4afc9 TIF: Add the video frame rate information to TvTrackInfo 
Bug: 16187997
Change-Id: I25d5489e42502fa8f2537aadc205bb4203980fb2
 2014-08-19 12:02:16 -07: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
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
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
Ihab Awad
9e4329ea0b Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev 2014-08-19 15:47:37 +00:00
Ihab Awad
6107bab041 ConnectionService API has only one completed callback (1/3) 
Refactor ConnectionService API so it has only one "completed"
callback, and connection state and failure codes indicates what
happened. Previous design where we had separate callbacks for failure,
cancellation and success was error prone because it was easy to forget
to implement one of them.

Bug: 16993846
Bug: 17070939

Change-Id: I84bf5d041cf78193ccf80db201b08db3b7014830
 2014-08-19 10:51:00 -07:00
Chris Craik
f1381debec Merge "Respect round rect clip when determining op opaqueness" into lmp-dev 2014-08-19 15:47:37 +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
Yorke Lee
38dd601d0a Merge "Make AudioState modes static constants" into lmp-dev 2014-08-19 02:43:23 +00:00
Yorke Lee
1426048bd3 Make AudioState modes static constants 
This enables the ability to use them in switch statements

Bug: 17161247
Change-Id: Iee3da676f2cd52a09d36b58da4ba4640bd8998c5
 2014-08-20 16:38:45 -07:00
Jeff Davidson
c8f0ffa297 Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 2014-08-20 21:47:20 +00:00
Jeff Davidson
05542603dd Less intrusive VPN dialog and other UX tweaks. 
-The ability to launch VPNs is now sticky; once approved by the user,
further approvals are not needed UNLESS the connection is revoked in
Quick Settings.

-The old persistent notification has been removed in favor of the new
Quick Settings UI.

-The name of the VPN app is now pulled from the label of the VPN
service rather than the app itself, if one is set.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
 2014-08-20 16:55:28 -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
Deepanshu Gupta
486ed3da0a Merge "Fix "@null" resource values in LayoutLib." into lmp-dev 2014-08-19 02:43:23 +00:00
Deepanshu Gupta
151b68ddc2 Fix "@null" resource values in LayoutLib. 
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
 2014-08-19 17:16:48 -07:00
Deepanshu Gupta
92973b8f37 Merge "Add time to status bar and fix wifi icon." into lmp-dev 2014-08-19 21:23:09 +00:00
Amith Yamasani
23ad2790ed Merge "Add a hidden method to query profile owner name for a user" into lmp-dev 2014-08-19 02:43:23 +00:00
Amith Yamasani
38f836b972 Add a hidden method to query profile owner name for a user 
Bug: 17066115
Change-Id: I812a37ea2e7bb6da5aa4c31cb7e37934e5d698fa
 2014-08-20 14:51:15 -07: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
Deepanshu Gupta
553a4e9138 Add time to status bar and fix wifi icon. 
Add vector drawable for wifi icon. Also add time to the status bar.

Change-Id: I01da833087a607e9bb6ff085929e3844990179f8
 2014-08-18 16:46:29 -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
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
Jorim Jaggi
8fbcaacdda Merge "Accessibility actions for lock/phone/camera icon" into lmp-dev 2014-08-16 04:36:39 +00:00
Jorim Jaggi
b2e104f8a2 Accessibility actions for lock/phone/camera icon 
Bug: 15859203
Change-Id: I02c988f4ed985e4381321aeca89cdfee68f44697
 2014-08-21 01:16:18 +02:00
Alan Viverette
aff1efa622 Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev 2014-08-19 22:53:25 +00:00
Alan Viverette
fd2dd208d9 Use correct single-letter date format in SimpleMonthView 
Also fixes layout on sw600dp-land (by removing the sw600dp layout!).

BUG: 17068298
Change-Id: I2545d0e1904a0028156b96b6ad17674c6107ce5d
 2014-08-19 18:11:54 -07: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
Igor Murashkin
981952d07a camera2: (Legacy) Add control.sceneMode = DISABLED to templates 
Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
 2014-08-19 11:04:31 -07: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