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

149580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Brown
49cb613c99 Reset auto-brightness setting to default. 
Reset the auto-brightness setting to default since the behavior
of the feature is now quite different and is being presented to
the user in a new way as "adaptive brightness".

Bug: 17114082
Change-Id: Ica63f4caaaf50ad95dc9df88bb376f79782976f7
 2014-08-20 14:45:38 -07:00
Jeff Brown
f1b2335a36 Only select bluetooth route by default when A2DP is enabled. 
Bug: 15756471
Change-Id: I822e51742e009b473000b8d67ec9c9a81c39b702
 2014-08-20 14:45:38 -07:00
Sailesh Nepal
163a80538e Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev 2014-08-20 21:39:11 +00:00
Kenny Guy
fa80a4faa3 Add apis for whitelisting IMEs and accessibility services. 
Adds apis for device / profile owners to white list
the accessibility and input methods a user can enable.

Bug: 14469005
Change-Id: I921888660d29a5370395db87adf75d4d106660c9
 2014-08-20 22:30:05 +01:00
Michael Wright
101717fc9d Add cleanspec for inputflinger removal 
Change-Id: I4fe5ca7f8024d3a8d68eea6070d8c508501da280
 2014-08-20 21:09:41 +00:00
vandwalle
612519db40 per bssid blacklist 
Bug: 16823537

This CL is dependent on Iff32fae2cd67343e63046d58d75fa1e10d9775d0

Change-Id: Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3
 2014-08-20 21:07:02 +00:00
Tenghui Zhu
d750563a34 Revert "Revert "Update indeterminate linear progress bar"" 
This reverts commit f010cb690c49887ba8fc6f925c468b8fa865a4c1.

Change-Id: I9e36ddf046eb0ff07fc736da2498e1669c8821f1
 2014-08-20 21:02:09 +00:00
Jeff Davidson
a10e152909 am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev 
* commit 'fa141926ed0318690213dbd620052daf7873a497':
  Improve documentation of ScanResult and WifiInfo.
 2014-08-20 20:52:13 +00:00
Alan Viverette
06cd7dce24 Forward additional drawable methods in AVD 
BUG: 17156349
Change-Id: I1d7b41fc8d0399b31db4cf21aa47180e96bfbcfe
 2014-08-20 13:44:44 -07:00
Adrian Roos
cc18724a91 am 323d9567: Merge "Allow SystemUI to control Bluetooth for secondary users" into lmp-dev 
* commit '323d9567c051fc17c70edb347d3245173603b33f':
  Allow SystemUI to control Bluetooth for secondary users
 2014-08-20 20:33:18 +00:00
Adam Powell
d7371b3a59 am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev 
* commit '7ad2d5b4eda851dc1d890b0e135a7a3c3bdb41b5':
  Correctly populate title for ResolverActivity
 2014-08-20 20:33:14 +00:00
Christopher Tate
bf0a405ca2 am 08191dff: Merge "Don\'t crash good-citizen restore session clients" into lmp-dev 
* commit '08191dff4ce703498f66cd74b2d3377d98d55587':
  Don't crash good-citizen restore session clients
 2014-08-20 20:28:33 +00:00
Jeff Sharkey
e9280ee577 am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev 
* commit '08db58c444b0c92d7e3fd55753c1ac8bad33cfa4':
  More progress towards split APKs in ASECs.
 2014-08-20 20:28:28 +00:00
Michael Lentine
629161692e am 97c4c03a: Merge "Reduce shutdown animation duration." into lmp-dev 
* commit '97c4c03a1655f7b82d13ecb96a36cec6caee666e':
  Reduce shutdown animation duration.
 2014-08-20 20:28:24 +00:00
Svetoslav
fed7173306 Using default system icon for print spooler 
bug:16568027

Change-Id: I87c7e7d60864b6d28899210bb400e56e21bf43f8
 2014-08-20 20:28:22 +00:00