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

8728 Commits

Author SHA1 Message Date
Paul Jensen
a68d213502 Remove captive portal sign-in actions. 
This reverts commit e0101cd and removes the related NetworkMonitor code.
The thinking is the broadcasts are not robust enough as they rely on apps
working together and are not sufficiently tested.

bug:17115050
Change-Id: I433032867cc4fea7191a1b13842b16825dc74df4
 2014-08-22 09:42:56 -04:00
Yohei Yukawa
b31fd9c8ee am f9040f30: am 3756a2e2: am dc42737e: Remove CursorAnchorInfoRequest and related stuff 
* commit 'f9040f30f0c80b3808999a3f639537ab36644a62':
  Remove CursorAnchorInfoRequest and related stuff
 2014-08-22 09:26:20 +00:00
Yohei Yukawa
a277db28e9 Remove CursorAnchorInfoRequest and related stuff 
This CL removes CursorAnchorInfoRequest and related stuff
in favor of InputConnection.requestUpdateCursorAnchorInfo,
which is more easy to understand. This CL also deprecates
InputMethodManager#updateCursor and related stuff.

Rationale:
1. The spec of #updateCursor says that it provides the cursor
   position in local coordinates, while the input method
   requires it in the screen coordinates.
2. #updateCursor has never been enabled in AOSP, because
   InputMethodManager#isWatchingCursor always returned false.
3. There has been no way to let
   InputMethodManager#isWatchingCursor return true.
4. In L, InputMethodManager#updateCursorAnchorInfo is
   introduced to address all the issues above.

Given that we no longer need to support #updateCursor,
CursorAnchorInfoRequest is overkill when we need to convey
just a couple of parameters.

BUG: 17185263
BUG: 17182367

Change-Id: I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef
 2014-08-22 00:55:06 -07:00
Jeff Brown
7d82751530 Hide PowerManager methods that third-party apps can't use. 
Change-Id: I9c4dbdef913f68939eb29f2c250c5fe3afc67399
 2014-08-21 22:43:25 -07:00
Jeff Brown
a71f03c481 Unhide the proximity sensor wakelock. 
Bug: 5354313
Change-Id: I59c6bfcd8ff2cebe264f69c49032737a45326373
 2014-08-21 22:20:48 -07:00
Lorenzo Colitti
f1a76832ad am 7f42fe30: am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev 
* commit '7f42fe3008fa6fe203da776bc118aa5f57d8829e':
  Rework the per-network URL API.
 2014-08-22 03:42:12 +00:00
Lorenzo Colitti
e258de6f9e Merge "Rework the per-network URL API." into lmp-dev 2014-08-22 03:07:28 +00:00
Lorenzo Colitti
9f1274b7e4 Rework the per-network URL API. 
This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
 2014-08-21 19:09:27 -07:00
Michael Wright
dc63f7b91c Add Voice Assist key. 
The action taken is dependent on whether the device is in an
interactive state, allowing for interactions to work even when the
device isn't actively being used

Bug: 16292420
Change-Id: I897f4383e7e4766c0bcb6246b41514b46e03a9ac
 2014-08-21 19:05:21 -07:00
Eino-Ville Talvala
a71becc870 am b85a39d4: am 9c324750: am 4e6326e7: Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 
* commit 'b85a39d44f08e558acfce676eea7bbac5447f905':
  Camera2: Fix return type of CaptureFailure#getFrameNumber
 2014-08-22 01:24:27 +00:00
Eino-Ville Talvala
2d9a18e02e Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 2014-08-22 00:46:41 +00:00
Tyler Gunn
27d1e257f3 Hiding Video telephony related APIs. 
Bug: 17188135
Change-Id: I2d4111dbad2430968a458f8f3bf4f2ca1becbbdd
 2014-08-21 16:38:40 -07:00
George Mount
049af94426 am d4f01e22: am 7f09ecc5: am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit 'd4f01e22a4c25e9b7b5a004d226a8fc635bf4eed':
  Add Parent Change to ChangeTransform
 2014-08-21 23:30:08 +00:00
George Mount
99db6030e1 Merge "Add Parent Change to ChangeTransform" into lmp-dev 2014-08-21 23:00:05 +00:00
George Mount
04ff14035e am fec07efc: am ef21ecd5: am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit 'fec07efcb3bd69b24c43a6a80bad4edb45671022':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:55:24 +00:00
Dake Gu
c94e2b393f Add Parent Change to ChangeTransform 
Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee
 2014-08-21 15:50:17 -07:00
George Mount
7762e8e798 Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 2014-08-21 22:26:57 +00:00
George Mount
b89d5cc2c6 Allow Activities to opt into using Overlay for shared elements. 
Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7
 2014-08-21 14:30:51 -07:00
Eino-Ville Talvala
edecaee1f2 Camera2: Fix return type of CaptureFailure#getFrameNumber 
Should be long, not int.

Bug: 17188354
Change-Id: If90749f21cdf9dd493aa561769655211a70acf29
 2014-08-21 14:28:50 -07:00
Andre Eisenbach
2edc9cbd2c am 2b420554: am bf22072d: am e2f5c5c4: Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 
* commit '2b4205544d4b816fb958681a3aa9b4c8ddfb3e7e':
  LE: Rename new MTU and connection paramter update APIs
 2014-08-21 18:26:19 +00:00
Andre Eisenbach
491cb3f578 Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 2014-08-21 17:56:25 +00:00
Andres Morales
dd9d2498c5 am 97b9be92: am ea5ffd04: am 87eeebec: Merge "Remove old NFC unlock api" into lmp-dev 
* commit '97b9be922d6ce1e1968f52c9122efef58480930e':
  Remove old NFC unlock api
 2014-08-21 17:40:44 +00:00
Dianne Hackborn
5aef45eca4 am 8c6c54ec: am a7d4d7bc: am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit '8c6c54ecfd281751925ff6df566e154c2f8aec60':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:27:02 +00:00
Andres Morales
6a12e77194 Merge "Remove old NFC unlock api" into lmp-dev 2014-08-21 17:07:32 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Zhijun He
cac49eb610 am acb8f467: am 8fece5d0: am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit 'acb8f467c86452b849dc6410db27668525baa075':
  Camera2: update aberration correction related tag name
 2014-08-21 16:48:02 +00:00
Esteban Talavera
8a4f5c7b0e am 065746f2: am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '065746f261d1d650d0ac492ad39abdf982a170ed':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:47:22 +00:00
Zhijun He
eee850d355 Merge "Camera2: update aberration correction related tag name" into lmp-dev 2014-08-21 16:17:52 +00:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Esteban Talavera
fc3487fe49 am 25900c0a: am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit '25900c0a347ae6d79efc0a96b06cf6933bd7c741':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:31:58 +00:00
Esteban Talavera
4d3fc0b828 am 3c736f5a: am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '3c736f5a538c44e6a438157a18378abad036c75b':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:21:58 +00:00
Esteban Talavera
2df7d1ef51 Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 2014-08-21 14:58:18 +00:00
Esteban Talavera
6f52c702fb am fd496a2c: am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit 'fd496a2c66d6f45e0cb009e8a52360b3560cdcc4':
  Remove setApplicationsHidden
 2014-08-21 14:43:53 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Esteban Talavera
d469a0b9ce Set last phrase for constant values of EXTRA_* fields to ALL_CAPS 
As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
 2014-08-21 14:58:14 +01:00
Niels Egberts
a1fc998924 am 190d2222: am 3709bca8: am 14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 
* commit '190d22224884cad530b2f8a1a671e91fd3f80244':
  Fixed spelling of android.nominative and updated some comments.
 2014-08-21 13:39:34 +00:00
Kenny Guy
6699748d68 resolved conflicts for merge of 06cc91a6 to master 
Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73
 2014-08-21 14:34:37 +01:00
Niels Egberts
5e5ee9945b Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 2014-08-21 11:33:01 +00:00
Kenny Guy
b9e468cb9d Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 2014-08-21 10:54:26 +00:00
Niels Egberts
b9f7692ce6 Fixed spelling of android.nominative and updated some comments. 
Bug: 17000831
Change-Id: I3a87635a6a894ee8ad1386cde8b59dcd9533b23f
 2014-08-21 11:28:29 +01:00
Esteban Talavera
115cd65d2a Remove setApplicationsHidden 
As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests.

Bug: 17005622
Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4
 2014-08-21 10:29:38 +01:00
Jae Seo
f06b40e8b5 am 128b1a8d: am 797eeba5: am 9c179483: API Review: android.media.tv 
* commit '128b1a8df3621158eac0737baadc6fe388b98a23':
  API Review: android.media.tv
 2014-08-21 05:16:12 +00:00
Zhijun He
9e4e439a68 Camera2: update aberration correction related tag name 
This is for API review update.

Bug: 17008587
Change-Id: I67c2cffed8fcc106008b0fde6f01cd81f4ce6db0
 2014-08-20 22:08:52 -07:00
Yorke Lee
d7b4182e32 am e63ea6a4: am fa0efcd1: am 0719e606: Merge "Make AudioState modes static constants" into lmp-dev 
* commit 'e63ea6a4009e6db4c3cfb4b354f527910b30b8d8':
  Make AudioState modes static constants
 2014-08-21 04:09:00 +00:00
Sailesh Nepal
cb9eac4788 am b7b8b579: am 2c4ffbf9: am 9c59bd75: Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev 
* commit 'b7b8b579c15c2d0cd77b0a93a122014890edd201':
  Clean up and fix bugs in ConnectionService.createConnection
 2014-08-21 04:08:14 +00:00
Jae Seo
14355950d5 API Review: android.media.tv 
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
  string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
 2014-08-20 20:59:51 -07:00
Jeff Sharkey
40aff029fe am 44884372: am 54a521e9: am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev 
* commit '448843725d388c409a0ac20602fbc5611e7b2134':
  More progress towards split APKs in ASECs.
 2014-08-21 03:33:20 +00:00
Dianne Hackborn
aec68bb89f Fix issue #17038762: Add API to add entries to the recents list 
New API Added to ActivityManager for adding an entry.  See docs
there.

Repercussions:

- I hit a bug in system UI where if the thumbnail has alpha, it tries
  to modify it, but thumbnails are loading immutable so crashes.  Fixed
  this by loading the bitmaps to be mutable.
- Improved dump output of recents; there was a lot of stuff missing.
  Also split the recents dump output from the rest of the activity
  output, since it can be really large.
- Added tests to the lovely ActivityTest app.

Bonus: new method on AppTask to control the exclude from recents flag.

Change-Id: I01e543db4d15320ee1701e95872fef73c116526c
 2014-08-20 18:03:43 -07:00
RoboErik
6b171b36f8 am 666360cb: am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev 
* commit '666360cbe70a3c482b16a0fd438a3f10d0fcf643':
  Api updates to MediaSession components
 2014-08-21 00:57:08 +00:00