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

149595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guang Zhu
00c4026e21 am e046262d: Merge "fixes for connectivity manager test suite" into lmp-dev 
* commit 'e046262d2d5883b800187a558c32883e1b87d33d':
  fixes for connectivity manager test suite
 2014-08-21 00:36:47 +00:00
Amit Mahajan
0f9851cb14 am 5b821459: Merge "Adding APIs to get IMEI/MEID" into lmp-dev 
* commit '5b8214597f6518132643bcd0ce37fa8d1ff6375a':
  Adding APIs to get IMEI/MEID
 2014-08-21 00:36:43 +00:00
Chris Craik
b825e937f7 am d093d695: Merge "Add bounds checking to nine patch scaling" into lmp-dev 
* commit 'd093d695c8be9a25642de5433521a5cb9e230f01':
  Add bounds checking to nine patch scaling
 2014-08-21 00:36:37 +00:00
Lorenzo Colitti
a29bc43b0d am aebd7b79: Merge "Update state to failed if the VPN fails to connect." into lmp-dev 
* commit 'aebd7b79eabf3ea775b5cc25b72cebacadb9a943':
  Update state to failed if the VPN fails to connect.
 2014-08-21 00:28:13 +00:00
Svet Ganov
635bc8bc84 Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 2014-08-21 00:22:45 +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
Rich Slogar
7bf7b77923 Merge "Docs: Fixed typo 'Fore'" into klp-modular-docs 2014-08-21 00:16:54 +00:00
Svetoslav
bdbb6e0679 Merge "Update the "More options" button in printing." into lmp-dev 2014-08-21 00:16:54 +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
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
Yorke Lee
7168e78bbc am 0719e606: Merge "Make AudioState modes static constants" into lmp-dev 
* commit '0719e60653d7e328ce6d810f3a58d13fc58f089c':
  Make AudioState modes static constants
 2014-08-21 00:14:04 +00:00
Guang Zhu
cf038760f2 Merge "fixes for connectivity manager test suite" into lmp-dev 2014-08-21 00:11:43 +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
Svetoslav
49cbfcc10c Merge "Using default system icon for print spooler" into lmp-dev 2014-08-21 00:11:43 +00:00
Guang Zhu
e02f340d9a Merge "follow up minor fixes for connectivity manager test" into lmp-dev 2014-08-21 00:11:43 +00:00
Guang Zhu
4afd179a9a follow up minor fixes for connectivity manager test 
Change-Id: I8f0606890b21d67130efb3bc02c6825823060139
 2014-08-20 17:40:18 -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
Amit Mahajan
284f1ec16e Adding APIs to get IMEI/MEID 
Change-Id: I553b7c019b20a64ff1049f35b0e3999ab82b7cce
 2014-08-20 17:02:17 -07:00
Jeff Davidson
0e7eb9b3b2 am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 
* commit '709941fd34e02fb6639ab31e04404b023c820dec':
  Less intrusive VPN dialog and other UX tweaks.
 2014-08-21 00:02:07 +00:00
Diego Pontoriero
735c479664 am dede6854: Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev 
* commit 'dede685497ef4be3c58cd1472f92540f27a2a14b':
  Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC.
 2014-08-21 00:02:03 +00:00
Amith Yamasani
b61504d544 am d5d82cf3: Merge "Add a hidden method to query profile owner name for a user" into lmp-dev 
* commit 'd5d82cf3fe07254eb35aea05c06473f81ab0e316':
  Add a hidden method to query profile owner name for a user
 2014-08-20 23:52:25 +00:00
Jorim Jaggi
a226b53656 am 61dfef79: Merge "Accessibility actions for lock/phone/camera icon" into lmp-dev 
* commit '61dfef79fc6e2a3d61314f378f38aef381cb1393':
  Accessibility actions for lock/phone/camera icon
 2014-08-20 23:52:21 +00:00
John Reck
a6074d245a am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev 
* commit '876f1a1ad2216bceaf437a5737f804bd7e355372':
  Implement full View.buildLayer
 2014-08-20 23:52:17 +00:00
Alan Viverette
99d2f93025 am a4fb61a6: Merge "Forward additional drawable methods in AVD" into lmp-dev 
* commit 'a4fb61a68eabd71bae9cbf58f0007704a1551aab':
  Forward additional drawable methods in AVD
 2014-08-20 23:52:13 +00:00
Ricardo Cervera
0d65bf25c8 am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit '262b41478d77bdebb78acccf795c14e9c097773e':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-20 23:50:07 +00:00
Ricardo Cervera
63da186fef am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202 
* commit 'c58078085a3fb30947d7982536ebe0a06cdf4b62':
  docs: Fixed typo in Wear training class. Bug: 16709202
 2014-08-20 23:50:03 +00: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
Rich Slogar
5c80662fab Docs: Fixed typo 'Fore' 
Change-Id: I67cacf2ca11be27f9352cd8bddb1f9e6ff8a65c6
 2014-08-20 16:29:02 -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
Ricardo Cervera
f01f8e8500 docs: Fixed typo in intents page. Bug: 16949177 
Change-Id: Ie3ae033932134058008dd17124f1bbd43e24a65d
 2014-08-20 15:57:44 -07:00
Ricardo Cervera
c58078085a docs: Fixed typo in Wear training class. Bug: 16709202 
Change-Id: I4649546f2ebe2dba7266a3260d0aa4388a2a7fe1
 2014-08-20 15:51:17 -07:00
Jason Monk
f7d3e88e88 am a765518f: Merge "Lock task doesn\'t always end properly." into lmp-dev 
* commit 'a765518fc82854224e156431c573bf8492545087':
  Lock task doesn't always end properly.
 2014-08-20 22:22:37 +00:00
Sailesh Nepal
86e88fd2a2 am 9c59bd75: Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev 
* commit '9c59bd75a24d1af3fa987c95950354ed1e6e7266':
  Clean up and fix bugs in ConnectionService.createConnection
 2014-08-20 22:22:32 +00:00
Tenghui Zhu
2629170590 am 36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev 
* commit '36f1b53f43c63db4bac3b18dba7fc96d85a50055':
  Revert "Revert "Update indeterminate linear progress bar""
 2014-08-20 22:22:27 +00:00
Jeff Brown
cf481ea624 am ddc35381: Reset auto-brightness setting to default. 
* commit 'ddc35381b014f7c65231036d9c8dd255680bca02':
  Reset auto-brightness setting to default.
 2014-08-20 22:22:23 +00:00
Jeff Brown
7beb1bc14e am 2bc60f6e: Only select bluetooth route by default when A2DP is enabled. 
* commit '2bc60f6e8c990549eb9173c88c0e1457ceb9acd7':
  Only select bluetooth route by default when A2DP is enabled.
 2014-08-20 22:22:18 +00:00
Wenchao Tong
cd8e041668 Revert "Annotate @SystemApi on some WifiManager methods." 
This reverts commit 041bcc22bd21f84358e5b2102e3a919bcdd99b81.

Bug: 17134034
Change-Id: I1ebcdd9b4c56e5c93fd5667699c8971e8c6e5452
 2014-08-20 22:10:36 +00:00
Michael Wright
782d4d1f66 am f2516f7c: Add cleanspec for inputflinger removal 
* commit 'f2516f7cb96ac5fd3f0dcb3db41891f94b0841be':
  Add cleanspec for inputflinger removal
 2014-08-20 21:56:56 +00:00
Ricardo Cervera
262b41478d Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 2014-08-20 21:47:20 +00:00
Ricardo Cervera
f246b0c4e9 docs: Fixed bug in declaring layout page. Bug: 16815916 
Change-Id: I8990488f45e7a09c948f5be006457205665b84a1
 2014-08-20 16:03:47 -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
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
Alan Viverette
f4b4616ddb Merge "Forward additional drawable methods in AVD" into lmp-dev 2014-08-20 21:47:20 +00:00
Tenghui Zhu
72a8e26257 Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev 2014-08-20 21:47:20 +00:00