OSDN Git Service

android-x86/frameworks-base.git
10 years agoAlways set transport control flags
RoboErik [Thu, 21 Aug 2014 17:13:58 +0000 (10:13 -0700)]
Always set transport control flags

In case we're attaching to a pre-existing session with non-zero flags.

bug:16822064
Change-Id: Ibd5cc8e00de59f1fe30fc3d0e64741aaf9f4746f

10 years agoam c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug...
Ricardo Cervera [Thu, 21 Aug 2014 17:44:53 +0000 (17:44 +0000)]
am c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

* commit 'c1da9cbff5d5b597fd58cbb578a1eadc6f479c80':
  docs: Fixed typo in intents page. Bug: 16949177

10 years agoam e415ebc6: am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp...
Rich Slogar [Thu, 21 Aug 2014 17:44:47 +0000 (17:44 +0000)]
am e415ebc6: am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs

* commit 'e415ebc634c98b5a6aaa42c0698b7482e44b3b3f':
  Docs: Fixed typo 'Fore'

10 years agoam e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout...
Ricardo Cervera [Thu, 21 Aug 2014 17:44:40 +0000 (17:44 +0000)]
am e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs

* commit 'e4be8986544a45a2560003f004b72528c691acef':
  docs: Fixed bug in declaring layout page. Bug: 16815916

10 years agoam 9e6b3e7d: am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug...
Ricardo Cervera [Thu, 21 Aug 2014 17:44:27 +0000 (17:44 +0000)]
am 9e6b3e7d: am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202

* commit '9e6b3e7dd85224c836e902551079c2445688d762':
  docs: Fixed typo in Wear training class. Bug: 16709202

10 years agoMerge "Clear identity before calling out to PackageHelper" into lmp-dev
Jeff Sharkey [Thu, 21 Aug 2014 17:42:01 +0000 (17:42 +0000)]
Merge "Clear identity before calling out to PackageHelper" into lmp-dev

10 years agoClear identity before calling out to PackageHelper
Robin Lee [Thu, 21 Aug 2014 15:51:18 +0000 (16:51 +0100)]
Clear identity before calling out to PackageHelper

PackageHelper.resolveInstallLocation expects the binding user to be
equivalent to the calling user. If this is not the case, it may fail
and throw an exception preventing anyone but user 0 from installing
anything.

Bug: 17175251
Change-Id: Id5615738c7b4e1234a548c7b4a410282d14c9ee3

10 years agoMerge "AAPT: Fix regression generating dynamic ref table for shared libraries" into...
Adam Lesinski [Thu, 21 Aug 2014 17:31:44 +0000 (17:31 +0000)]
Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev

10 years agoam 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177...
Ricardo Cervera [Thu, 21 Aug 2014 17:31:31 +0000 (17:31 +0000)]
am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

* commit '2c374e643d6cce73a71fb57559f898b6b554e36c':
  docs: Fixed typo in intents page. Bug: 16949177

10 years agoam d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs
Rich Slogar [Thu, 21 Aug 2014 17:31:27 +0000 (17:31 +0000)]
am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs

* commit 'd309de3d06817e51aab056284874f613238ff400':
  Docs: Fixed typo 'Fore'

10 years agoam 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815...
Ricardo Cervera [Thu, 21 Aug 2014 17:31:03 +0000 (17:31 +0000)]
am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs

* commit '0d65bf25c8a9091d598f50e0d534625107db6cf6':
  docs: Fixed bug in declaring layout page. Bug: 16815916

10 years agoam 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202
Ricardo Cervera [Thu, 21 Aug 2014 17:30:57 +0000 (17:30 +0000)]
am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202

* commit '63da186fef8add43bcd0c347eec86946b67350c3':
  docs: Fixed typo in Wear training class. Bug: 16709202

10 years agoMerge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev
Winson Chung [Thu, 21 Aug 2014 17:19:27 +0000 (17:19 +0000)]
Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev

10 years agoMerge "Remove old NFC unlock api" into lmp-dev
Andres Morales [Thu, 21 Aug 2014 17:07:31 +0000 (17:07 +0000)]
Merge "Remove old NFC unlock api" into lmp-dev

10 years agoMerge "Send captive portal broadcast as user CURRENT." into lmp-dev
Paul Jensen [Thu, 21 Aug 2014 17:05:41 +0000 (17:05 +0000)]
Merge "Send captive portal broadcast as user CURRENT." into lmp-dev

10 years agoMerge "Set transport control flags when a session is created" into lmp-dev
RoboErik [Thu, 21 Aug 2014 16:58:40 +0000 (16:58 +0000)]
Merge "Set transport control flags when a session is created" into lmp-dev

10 years agoMerge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev
Dianne Hackborn [Thu, 21 Aug 2014 16:56:17 +0000 (16:56 +0000)]
Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev

10 years agoMerge "Clarify text shadow attribute/method comments" into lmp-dev
Chris Craik [Thu, 21 Aug 2014 16:46:51 +0000 (16:46 +0000)]
Merge "Clarify text shadow attribute/method comments" into lmp-dev

10 years agoMerge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev
Nicolas Prevot [Thu, 21 Aug 2014 16:33:46 +0000 (16:33 +0000)]
Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev

10 years agoMerge "Save PatternVisible setting to crypto header" into lmp-dev
Paul Lawrence [Thu, 21 Aug 2014 16:25:55 +0000 (16:25 +0000)]
Merge "Save PatternVisible setting to crypto header" into lmp-dev

10 years agoMarking the methods to get Profile/Device Owner with @SystemApi.
Nicolas Prevot [Wed, 6 Aug 2014 16:03:25 +0000 (17:03 +0100)]
Marking the methods to get Profile/Device Owner with @SystemApi.

BUG: 16860239

Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec

10 years agoMerge "Camera2: update aberration correction related tag name" into lmp-dev
Zhijun He [Thu, 21 Aug 2014 16:17:51 +0000 (16:17 +0000)]
Merge "Camera2: update aberration correction related tag name" into lmp-dev

10 years agoMerge "TIF: Accept any character for custom label." into lmp-dev
Jaewan Kim [Thu, 21 Aug 2014 16:13:24 +0000 (16:13 +0000)]
Merge "TIF: Accept any character for custom label." into lmp-dev

10 years agoMerge "Fix findConnectionTypeForIface." into lmp-dev
Lorenzo Colitti [Thu, 21 Aug 2014 16:08:11 +0000 (16:08 +0000)]
Merge "Fix findConnectionTypeForIface." into lmp-dev

10 years agoTIF: Accept any character for custom label.
Jaewan Kim [Thu, 21 Aug 2014 15:43:31 +0000 (00:43 +0900)]
TIF: Accept any character for custom label.

Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7

10 years agoMerge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev
Wenchao Tong [Thu, 21 Aug 2014 16:04:59 +0000 (16:04 +0000)]
Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev

10 years agoMerge "Throw exception on nonexistent font" into lmp-dev
Behdad Esfahbod [Thu, 21 Aug 2014 16:01:52 +0000 (16:01 +0000)]
Merge "Throw exception on nonexistent font" into lmp-dev

10 years agoMerge "Replicate text and sounds settings for managed profile." into lmp-dev
Kenny Guy [Thu, 21 Aug 2014 15:55:42 +0000 (15:55 +0000)]
Merge "Replicate text and sounds settings for managed profile." into lmp-dev

10 years agoMerge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev
Esteban Talavera [Thu, 21 Aug 2014 15:33:19 +0000 (15:33 +0000)]
Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev

10 years agoam 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular...
Ricardo Cervera [Thu, 21 Aug 2014 15:31:34 +0000 (15:31 +0000)]
am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

* commit '82957e38b2d38ea41fdf930d722157287eab0590':
  docs: Fixed typo in intents page. Bug: 16949177

10 years agoMerge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs
Ricardo Cervera [Thu, 21 Aug 2014 15:22:10 +0000 (15:22 +0000)]
Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs

10 years agoMerge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev
Esteban Talavera [Thu, 21 Aug 2014 15:21:58 +0000 (15:21 +0000)]
Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev

10 years agoMerge "Update notification layouts to match redlines" into lmp-dev
Jorim Jaggi [Thu, 21 Aug 2014 15:21:21 +0000 (15:21 +0000)]
Merge "Update notification layouts to match redlines" into lmp-dev

10 years agoReplicate text and sounds settings for managed profile.
Kenny Guy [Thu, 21 Aug 2014 15:17:09 +0000 (16:17 +0100)]
Replicate text and sounds settings for managed profile.

Replicate touch sound / vibrate setting and show password
setting between managed and parent user.

Bug: 17064707,17157511
Change-Id: I70ea9f2ac57ba5a8f9619b21eb7adad91011d733

10 years agoUpdate notification layouts to match redlines
Jorim Jaggi [Tue, 19 Aug 2014 20:33:42 +0000 (22:33 +0200)]
Update notification layouts to match redlines

Also fixes a lot of paddings and other small issues with
the notification layouts.

Bug: 15437369
Change-Id: I40b6c69afc160c498b7e2e709814b5b847f615de

10 years agoInvoke shutdownMobileRadios Telephony APIs from ShutdownThread
Naveen Kalla [Sat, 2 Aug 2014 08:03:42 +0000 (01:03 -0700)]
Invoke shutdownMobileRadios Telephony APIs from ShutdownThread

shutdownMobileRadios API shuts down multiple Radios on MSIM devices and
also gracefully shuts down Radios and SIM cards on single SIM and
MSIM devices. Use this API instead of the old setRadio APIs.

Add RIL_REQUEST_SHUTDOWN to RILConstants. Message is sent to notify
RIL that the device is shutting down.

Bug: 9773278
Change-Id: I6afa9e810cefc7855f7ae42e51f39cc51fa2aa6e

10 years agoMerge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev
Esteban Talavera [Thu, 21 Aug 2014 14:58:17 +0000 (14:58 +0000)]
Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev

10 years agoMerge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev
Esteban Talavera [Thu, 21 Aug 2014 14:58:06 +0000 (14:58 +0000)]
Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev

10 years agoMerge "per bssid blacklist" into lmp-dev
vandwalle [Thu, 21 Aug 2014 14:55:10 +0000 (14:55 +0000)]
Merge "per bssid blacklist" into lmp-dev

10 years agoRename get/setBlockUninstall() to get/setUninstallBlocked()
Esteban Talavera [Wed, 20 Aug 2014 10:35:57 +0000 (11:35 +0100)]
Rename get/setBlockUninstall() to get/setUninstallBlocked()

As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e

10 years agoMerge "Run RevealAnimator on RT" into lmp-dev
John Reck [Thu, 21 Aug 2014 14:23:26 +0000 (14:23 +0000)]
Merge "Run RevealAnimator on RT" into lmp-dev

10 years agoMerge "Remove setApplicationsHidden" into lmp-dev
Esteban Talavera [Thu, 21 Aug 2014 14:17:23 +0000 (14:17 +0000)]
Merge "Remove setApplicationsHidden" into lmp-dev

10 years agoMerge "Update VPN Icon to key." into lmp-dev
Jason Monk [Thu, 21 Aug 2014 14:06:52 +0000 (14:06 +0000)]
Merge "Update VPN Icon to key." into lmp-dev

10 years agoSet last phrase for constant values of EXTRA_* fields to ALL_CAPS
Esteban Talavera [Wed, 20 Aug 2014 12:54:25 +0000 (13:54 +0100)]
Set last phrase for constant values of EXTRA_* fields to ALL_CAPS

As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926

10 years agoDon't stack toasts for every user press
Jason Monk [Tue, 19 Aug 2014 19:20:01 +0000 (15:20 -0400)]
Don't stack toasts for every user press

Showing a toast on every press was adding up to a long list of
toasts to clear out of the display, now cancel the last so we
don't have that problem.

Also fix unlock strings to not use insertions because of problems
translating the context.

Bug: 16892731
Bug: 16366701
Change-Id: Ia523469089c9f8dd1f3e466a9d4ea901a376d1bc

10 years agoUpdated documentation for setScreenCaptureDisabled()
Esteban Talavera [Thu, 21 Aug 2014 13:03:55 +0000 (14:03 +0100)]
Updated documentation for setScreenCaptureDisabled()

As requested in the API review. Also, removed unused import.

Bug: 17005622
Change-Id: I0bc57411ec34119f64e28eaf27c32a67b45fd66f

10 years agoSend captive portal broadcast as user CURRENT.
Paul Jensen [Wed, 20 Aug 2014 15:01:41 +0000 (11:01 -0400)]
Send captive portal broadcast as user CURRENT.

Previously this was sent without a qualifying user.

bug:17138439
Change-Id: I6345f2375fee168f86c0611e76f869e7377befbe

10 years agoTIF: Release main TvView on reset()
Ji-Hwan Lee [Thu, 21 Aug 2014 08:53:15 +0000 (17:53 +0900)]
TIF: Release main TvView on reset()

Also, use WeakReference for TvView.sMainTvView.

Change-Id: I6eec1c9f907692f0fbfa96d80c7d1141eabde6e2

10 years agoMerge "Fix broken brightness mirror" into lmp-dev
Adrian Roos [Thu, 21 Aug 2014 11:58:43 +0000 (11:58 +0000)]
Merge "Fix broken brightness mirror" into lmp-dev

10 years agoFix broken brightness mirror
Adrian Roos [Wed, 20 Aug 2014 22:03:15 +0000 (00:03 +0200)]
Fix broken brightness mirror

Bug: 17136823
Change-Id: I5609b2d539db56ec235899c069a080c8a959d254

10 years agoMerge "Fixed spelling of android.nominative and updated some comments." into lmp-dev
Niels Egberts [Thu, 21 Aug 2014 11:33:00 +0000 (11:33 +0000)]
Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev

10 years agoMerge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev
Kenny Guy [Thu, 21 Aug 2014 10:54:25 +0000 (10:54 +0000)]
Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev

10 years agoFixed spelling of android.nominative and updated some comments.
Niels Egberts [Wed, 13 Aug 2014 14:22:53 +0000 (15:22 +0100)]
Fixed spelling of android.nominative and updated some comments.

Bug: 17000831
Change-Id: I3a87635a6a894ee8ad1386cde8b59dcd9533b23f

10 years agoMerge "Strings: replace work space by work profile" into lmp-dev
Jessica Hummel [Thu, 21 Aug 2014 10:08:56 +0000 (10:08 +0000)]
Merge "Strings: replace work space by work profile" into lmp-dev

10 years agoStrings: replace work space by work profile
Jessica Hummel [Tue, 19 Aug 2014 16:45:54 +0000 (17:45 +0100)]
Strings: replace work space by work profile

Change-Id: I3f2dd5f628a34e1df351b3f1a526f3d2beea3ece
bug:16468412

10 years agoRemove setApplicationsHidden
Esteban Talavera [Thu, 21 Aug 2014 09:25:08 +0000 (10:25 +0100)]
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

10 years agoMerge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev
Jinsuk Kim [Thu, 21 Aug 2014 05:53:50 +0000 (05:53 +0000)]
Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev

10 years agoCEC: Fix a bug not sending <Set Stream Path>
Jinsuk Kim [Thu, 21 Aug 2014 05:31:40 +0000 (14:31 +0900)]
CEC: Fix a bug not sending <Set Stream Path>

Passes the right flag to manual routing switching method for TV
to send out <Set Stream Path> to the newly selected device(path).

Bug: 17169555
Change-Id: I4a14925e366a433f36b28170e37d041053c0060d

10 years agoMerge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev
Jinsuk Kim [Thu, 21 Aug 2014 05:26:18 +0000 (05:26 +0000)]
Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev

10 years agoCamera2: update aberration correction related tag name
Zhijun He [Mon, 18 Aug 2014 18:12:32 +0000 (11:12 -0700)]
Camera2: update aberration correction related tag name

This is for API review update.

Bug: 17008587
Change-Id: I67c2cffed8fcc106008b0fde6f01cd81f4ce6db0

10 years agoMerge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev
Junda Liu [Thu, 21 Aug 2014 04:43:37 +0000 (04:43 +0000)]
Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev

10 years agoMerge "Fix threading issue for advertising." into lmp-dev
Wei Wang [Thu, 21 Aug 2014 04:10:50 +0000 (04:10 +0000)]
Merge "Fix threading issue for advertising." into lmp-dev

10 years agoAPI Review: android.media.tv
Jae Seo [Wed, 20 Aug 2014 06:36:02 +0000 (23:36 -0700)]
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

10 years agoCEC: Invoke input change for RAP request from MHL device
Jinsuk Kim [Wed, 20 Aug 2014 08:45:22 +0000 (17:45 +0900)]
CEC: Invoke input change for RAP request from MHL device

Transform RAP[ContentOn/Off] to input change event.

Bug: 17141884
Change-Id: Ic2d8e305f482ebb4f4f3b3e167f726a66dc174cf

10 years agoSet transport control flags when a session is created
RoboErik [Thu, 21 Aug 2014 01:19:30 +0000 (18:19 -0700)]
Set transport control flags when a session is created

Some apps only set the transport control flags once when their service
starts. This was leading to them not getting set when a session is
created on their behalf in RCC. This sets the flags when a session
is created if needed.

bug:16822064
Change-Id: Iea1ebf7747b3059101eb3c36b143b594cc51e114

10 years agoFix issue #17038762: Add API to add entries to the recents list
Dianne Hackborn [Wed, 20 Aug 2014 22:25:13 +0000 (15:25 -0700)]
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

10 years agoClarify text shadow attribute/method comments
Chris Craik [Thu, 21 Aug 2014 00:16:05 +0000 (17:16 -0700)]
Clarify text shadow attribute/method comments

bug:17157162

Change-Id: I7abe7c0eb1973ddf7d7a17d9dd85c08833c4bf88

10 years agoam 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs
Rich Slogar [Thu, 21 Aug 2014 00:57:30 +0000 (00:57 +0000)]
am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs

* commit '7bf7b77923cda854fb46bb40473282ae10e1dea4':
  Docs: Fixed typo 'Fore'

10 years agoAAPT: Fix regression generating dynamic ref table for shared libraries
Adam Lesinski [Wed, 20 Aug 2014 21:59:19 +0000 (14:59 -0700)]
AAPT: Fix regression generating dynamic ref table for shared libraries

AAPT stopped generating dynamic reference tables for shared libraries.

Change-Id: Ib0025811bdca1a4756eb21080dd6b6bb3fc1ca3d

10 years agoFixing issue with inconsistent icon filename. (Bug 16992882)
Winson Chung [Wed, 20 Aug 2014 00:44:32 +0000 (17:44 -0700)]
Fixing issue with inconsistent icon filename. (Bug 16992882)

10 years agoMerge "Notify app widget hosts when cross-profile providers change." into lmp-dev
Svet Ganov [Thu, 21 Aug 2014 02:00:11 +0000 (02:00 +0000)]
Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev

10 years agoMerge "Docs: Fixed typo 'Fore'" into klp-modular-docs
Rich Slogar [Thu, 21 Aug 2014 00:47:21 +0000 (00:47 +0000)]
Merge "Docs: Fixed typo 'Fore'" into klp-modular-docs

10 years agoMerge "Unify code paths for collapsing action views in action bars" into lmp-dev
Adam Powell [Thu, 21 Aug 2014 00:37:53 +0000 (00:37 +0000)]
Merge "Unify code paths for collapsing action views in action bars" into lmp-dev

10 years agoUnify code paths for collapsing action views in action bars
Adam Powell [Thu, 21 Aug 2014 00:33:24 +0000 (17:33 -0700)]
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

10 years agoMerge "fixes for connectivity manager test suite" into lmp-dev
Guang Zhu [Thu, 21 Aug 2014 00:34:11 +0000 (00:34 +0000)]
Merge "fixes for connectivity manager test suite" into lmp-dev

10 years agoMerge "Adding APIs to get IMEI/MEID" into lmp-dev
Amit Mahajan [Thu, 21 Aug 2014 00:32:14 +0000 (00:32 +0000)]
Merge "Adding APIs to get IMEI/MEID" into lmp-dev

10 years agoMerge "Add bounds checking to nine patch scaling" into lmp-dev
Chris Craik [Thu, 21 Aug 2014 00:29:13 +0000 (00:29 +0000)]
Merge "Add bounds checking to nine patch scaling" into lmp-dev

10 years agofixes for connectivity manager test suite
Guang Zhu [Mon, 18 Aug 2014 23:18:00 +0000 (16:18 -0700)]
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

10 years agoMerge "follow up minor fixes for connectivity manager test" into lmp-dev
Guang Zhu [Thu, 21 Aug 2014 00:47:30 +0000 (00:47 +0000)]
Merge "follow up minor fixes for connectivity manager test" into lmp-dev

10 years agofollow up minor fixes for connectivity manager test
Guang Zhu [Thu, 21 Aug 2014 00:40:18 +0000 (17:40 -0700)]
follow up minor fixes for connectivity manager test

Change-Id: I8f0606890b21d67130efb3bc02c6825823060139

10 years agoMerge "Using default system icon for print spooler" into lmp-dev
Svetoslav [Thu, 21 Aug 2014 01:59:09 +0000 (01:59 +0000)]
Merge "Using default system icon for print spooler" into lmp-dev

10 years agoMerge "Update the "More options" button in printing." into lmp-dev
Svetoslav [Thu, 21 Aug 2014 01:58:38 +0000 (01:58 +0000)]
Merge "Update the "More options" button in printing." into lmp-dev

10 years agoMerge "Update state to failed if the VPN fails to connect." into lmp-dev
Lorenzo Colitti [Thu, 21 Aug 2014 00:19:04 +0000 (00:19 +0000)]
Merge "Update state to failed if the VPN fails to connect." into lmp-dev

10 years agoAdding APIs to get IMEI/MEID
Amit Mahajan [Tue, 19 Aug 2014 00:49:59 +0000 (17:49 -0700)]
Adding APIs to get IMEI/MEID

Change-Id: I553b7c019b20a64ff1049f35b0e3999ab82b7cce

10 years agoam 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into...
Ricardo Cervera [Wed, 20 Aug 2014 23:50:07 +0000 (23:50 +0000)]
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

10 years agoam c5807808: docs: Fixed typo in Wear training class. Bug: 16709202
Ricardo Cervera [Wed, 20 Aug 2014 23:50:03 +0000 (23:50 +0000)]
am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202

* commit 'c58078085a3fb30947d7982536ebe0a06cdf4b62':
  docs: Fixed typo in Wear training class. Bug: 16709202

10 years agoAdd bounds checking to nine patch scaling
Chris Craik [Wed, 20 Aug 2014 23:31:57 +0000 (16:31 -0700)]
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

10 years agoDocs: Fixed typo 'Fore'
Rich Slogar [Wed, 20 Aug 2014 23:29:02 +0000 (16:29 -0700)]
Docs: Fixed typo 'Fore'

Change-Id: I67cacf2ca11be27f9352cd8bddb1f9e6ff8a65c6

10 years agoUpdate state to failed if the VPN fails to connect.
Lorenzo Colitti [Wed, 20 Aug 2014 23:01:44 +0000 (16:01 -0700)]
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

10 years agodocs: Fixed typo in intents page. Bug: 16949177
Ricardo Cervera [Wed, 20 Aug 2014 22:57:44 +0000 (15:57 -0700)]
docs: Fixed typo in intents page. Bug: 16949177

Change-Id: Ie3ae033932134058008dd17124f1bbd43e24a65d

10 years agodocs: Fixed typo in Wear training class. Bug: 16709202
Ricardo Cervera [Wed, 20 Aug 2014 22:51:17 +0000 (15:51 -0700)]
docs: Fixed typo in Wear training class. Bug: 16709202

Change-Id: I4649546f2ebe2dba7266a3260d0aa4388a2a7fe1

10 years agoRevert "Annotate @SystemApi on some WifiManager methods."
Wenchao Tong [Wed, 20 Aug 2014 22:08:40 +0000 (22:08 +0000)]
Revert "Annotate @SystemApi on some WifiManager methods."

This reverts commit 041bcc22bd21f84358e5b2102e3a919bcdd99b81.

Bug: 17134034
Change-Id: I1ebcdd9b4c56e5c93fd5667699c8971e8c6e5452

10 years agoMerge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular...
Ricardo Cervera [Wed, 20 Aug 2014 23:24:45 +0000 (23:24 +0000)]
Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs

10 years agodocs: Fixed bug in declaring layout page. Bug: 16815916
Ricardo Cervera [Wed, 20 Aug 2014 23:03:47 +0000 (16:03 -0700)]
docs: Fixed bug in declaring layout page. Bug: 16815916

Change-Id: I8990488f45e7a09c948f5be006457205665b84a1

10 years agoMerge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for...
Diego Pontoriero [Wed, 20 Aug 2014 23:53:11 +0000 (23:53 +0000)]
Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev

10 years agoAdd apis for whitelisting IMEs and accessibility services.
Kenny Guy [Wed, 20 Aug 2014 18:40:59 +0000 (19:40 +0100)]
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

10 years agoper bssid blacklist
vandwalle [Wed, 20 Aug 2014 21:01:06 +0000 (14:01 -0700)]
per bssid blacklist

Bug: 16823537

This CL is dependent on Iff32fae2cd67343e63046d58d75fa1e10d9775d0

Change-Id: Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3

10 years agoUsing default system icon for print spooler
Svetoslav [Wed, 20 Aug 2014 20:26:54 +0000 (13:26 -0700)]
Using default system icon for print spooler

bug:16568027

Change-Id: I87c7e7d60864b6d28899210bb400e56e21bf43f8

10 years agoNotify app widget hosts when cross-profile providers change.
Svet Ganov [Wed, 20 Aug 2014 16:47:47 +0000 (09:47 -0700)]
Notify app widget hosts when cross-profile providers change.

1. Notify the hosts in the group if a package gets white-listed or
   un-white-listed for providing widgets across profiles.

2. Notify hosts in the group for provider changes when a profile
   is deleted.

bug:17126070

Change-Id: Ic719c1c68e45842d50decc95603f1d61583b8f02

10 years agoMerge "Improve documentation of ScanResult and WifiInfo." into lmp-dev
Jeff Davidson [Wed, 20 Aug 2014 20:41:43 +0000 (20:41 +0000)]
Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev