Commit Graph

31218 Commits

Author SHA1 Message Date
Adam Powell
bdb284c516 am 91fa056a: am 27439903: Merge "GridLayout changes for API council" into klp-dev
* commit '91fa056a58fdad8f8e6e8a76a902c2a566364f29':
  GridLayout changes for API council
2013-08-29 15:43:04 -07:00
Adam Powell
91fa056a58 am 27439903: Merge "GridLayout changes for API council" into klp-dev
* commit '27439903438abfb24f5c36151386e723f2e57ebc':
  GridLayout changes for API council
2013-08-29 15:41:23 -07:00
Adam Powell
2743990343 Merge "GridLayout changes for API council" into klp-dev 2013-08-29 22:38:24 +00:00
Wink Saville
ae1fda5aa3 am d2f41b3d: am 35bd30b1: Merge "Merge commit \'270226b0\' into manualmerge" into klp-dev
* commit 'd2f41b3dc692e2c9a0c2f60bdf0730d9b52b6df3':
  Add support for handling mobile provisioning networks.
2013-08-29 15:16:27 -07:00
Wink Saville
d2f41b3dc6 am 35bd30b1: Merge "Merge commit \'270226b0\' into manualmerge" into klp-dev
* commit '35bd30b184b321754697b992aa5c581e204d530a':
  Add support for handling mobile provisioning networks.
2013-08-29 15:14:02 -07:00
Wink Saville
35bd30b184 Merge "Merge commit '270226b0' into manualmerge" into klp-dev 2013-08-29 22:10:52 +00:00
Adam Powell
465ea74234 GridLayout changes for API council
* Hide set/getPrinter methods. A change/addition like this should
  happen for all views if it happens, not just for one specific view.

* Follow Android style guidelines for fields.

Bug 10549037

Change-Id: I1823d7bbbd8bcc678c5be2358ca23a8dc6dbfd15
(cherry picked from commit 916159461bf17e13c245a709935a0d1133e0ed91)
2013-08-29 21:59:22 +00:00
Wink Saville
7788c61af5 Merge commit '270226b0' into manualmerge
* commit '270226b0':
  Add support for handling mobile provisioning networks.

Conflicts:
	core/java/android/net/CaptivePortalTracker.java
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	core/java/android/net/MobileDataStateTracker.java
	core/res/AndroidManifest.xml
	services/java/com/android/server/ConnectivityService.java

Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-29 14:57:08 -07:00
Amith Yamasani
4014239337 am b14f82be: am 79a45c6f: Merge "Improve Intent disambig dialog behavior" into klp-dev
* commit 'b14f82be509da4698c6aeb4bb3d1e483f85375af':
  Improve Intent disambig dialog behavior
2013-08-29 14:56:03 -07:00
Amith Yamasani
b14f82be50 am 79a45c6f: Merge "Improve Intent disambig dialog behavior" into klp-dev
* commit '79a45c6f1837d5921e512213904c96660b1a80b1':
  Improve Intent disambig dialog behavior
2013-08-29 14:49:28 -07:00
Amith Yamasani
79a45c6f18 Merge "Improve Intent disambig dialog behavior" into klp-dev 2013-08-29 21:45:04 +00:00
Martijn Coenen
b86f00a077 am 10581450: am a6dcf1a2: Merge "Add an API for querying HCE service selection mode." into klp-dev
* commit '1058145049b1307aea452a198bced1d38d2b9b72':
  Add an API for querying HCE service selection mode.
2013-08-29 14:09:34 -07:00
Martijn Coenen
1058145049 am a6dcf1a2: Merge "Add an API for querying HCE service selection mode." into klp-dev
* commit 'a6dcf1a2d634bd8c26b6a5744fc38874bcac6dd9':
  Add an API for querying HCE service selection mode.
2013-08-29 14:06:22 -07:00
Martijn Coenen
a6dcf1a2d6 Merge "Add an API for querying HCE service selection mode." into klp-dev 2013-08-29 21:01:16 +00:00
Martijn Coenen
c3f0044abe Add an API for querying HCE service selection mode.
This allows applications to differentiate between
the case where another app is the default, or the
case where the selection mode is "Ask every time".

Also, parse new requireDeviceUnlock attribute in
ApduServiceInfo.

Bug: 10262585
Change-Id: Icac508fe00054132574731532c05a1138edb24f5
2013-08-29 13:23:03 -07:00
Martijn Coenen
f42c0fcb90 am ff8ec5c5: am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
* commit 'ff8ec5c56fd81f977c46a39badfd7de3bbfebfdd':
  Add requireDeviceUnlock attribute for NFC HCE.
2013-08-29 12:59:43 -07:00
Martijn Coenen
ff8ec5c56f am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
* commit 'c9c5d57e4e900573b8f8b65af4215cb45b48ce93':
  Add requireDeviceUnlock attribute for NFC HCE.
2013-08-29 12:57:33 -07:00
Martijn Coenen
c9c5d57e4e Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 2013-08-29 19:56:01 +00:00
Isaac Katzenelson
8117047ac7 am 87fe4c28: am 1d04b640: Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
* commit '87fe4c28d3784d7eceabb56ee25f785d89577844':
  Add ACTION_SHOW_ALARMS to Clock API
2013-08-29 11:03:47 -07:00
Isaac Katzenelson
87fe4c28d3 am 1d04b640: Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
* commit '1d04b640ec97e31b8d4fbef134a5b7f083eac9b7':
  Add ACTION_SHOW_ALARMS to Clock API
2013-08-29 10:57:47 -07:00
Isaac Katzenelson
1d04b640ec Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev 2013-08-29 17:52:32 +00:00
Sam Blitzstein
2f7acd19be Add ACTION_SHOW_ALARMS to Clock API
Add in an action to jump to the alarms page of a clock app.
Helpful for quick settings, for example.

Bug: 10506871
Change-Id: Ia18708c7962543911864dfaefa17d5356eed1b45
2013-08-29 10:49:57 -07:00
Wink Saville
270226b0dd am 8cb2f42e: am 948282b0: Add support for handling mobile provisioning networks.
* commit '8cb2f42eea2ef3b249528aa7913fc7a6dfc6b741':
  Add support for handling mobile provisioning networks.
2013-08-29 10:26:06 -07:00
Wink Saville
948282b0e6 Add support for handling mobile provisioning networks.
When a sim is new or it has expired it needs to be provisioned
with the carrier. Basically provisioning is associating a sim with
a user account. When a sim isn't provisioned then operators will
restrict access to the network and only allow certain addresses
or services to be used.

This set of changes allows two types of provisioning networks to be
recognized. The first is a network that causes all DNS lookups to be
redirected to a different address than was intended. This is exemplified
by how T-Mobile works.

The second technique uses a special apn for provisioning. An example is
AT&T where lwaactivate is the provisioning apn and broadband is the
normal apn. We first try broadband and if we are unable to connect we
try lwaactivate. When we see the activate we identify it as special and
the ApnContext.isProvisioningApn will return true.

In the future our plan is to create a new network type that can be added
to the apn list, but for now it identified by name.

Here is a list of significant changes:

 - CaptivePortalTracker now only test WiFi networks instead of all networks
 - checkMobileProvisioning checks for provisioning networks and doesn't
   try to ping.
 - IConnectivityManager.aidl changes:
   * getProvisioningOrActiveNetworkInfo was added to and used by Manage
     mobile plan in WirelessSettings so even when there is no active
     network it will still allow provisioning. Otherwise it would report
     no internet connection.
   * setSignInErrorNotificationVisible is used by both
     CaptiviePortalTracker and checkMobileProvisioning so they use the
     same code for the notifications.
   * checkMobileProvisioning was simplified to have only a timeout as
     returning the result is now harder as we abort simultaneous call
     otherwise we'd could get into loops because we now check every time
     we connect to mobile.
 - Enhanced MDST to handle the provisioning network.
 - Added CONNECTED_TO_PROVISIONING_NETWORK to NetworkInfo to make a new
   state so we don't announce to the world we're connected.
 - TelephonyIntents.ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN
   is sent by the low level data connection code to notify Connectivity
   Service that a provisioning apn has connected. This allows CS to
   handle the connection differently than a normal connection.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-29 08:55:16 -07:00
Jeff Hao
7be3a138d5 Add frameworks support for sample profiling from traceview gui.
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)

Change-Id: I3553bafe24ac8deb4fa3f9a4d78939c3848b3850
2013-08-28 22:13:17 -07:00
Jeff Sharkey
98486543cc am 6607275b: am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev
* commit '6607275b3a99b28f4176f8f8cc87f46c5ed051db':
  Stronger DocumentsProvider contract.
2013-08-28 21:35:17 -07:00
Jeff Sharkey
6607275b3a am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev
* commit '9fd81a9008d5c8dd33272b6a451d89fa2fa1841e':
  Stronger DocumentsProvider contract.
2013-08-28 21:32:08 -07:00
Jeff Sharkey
9fd81a9008 Merge "Stronger DocumentsProvider contract." into klp-dev 2013-08-29 04:27:02 +00:00
Jeff Sharkey
aeb16e2435 Stronger DocumentsProvider contract.
Using a contract class requires that a provider implement it exactly
with little help. This change introduces a DocumentsProvider abstract
class that provides a client-side implementation of the contract that
greatly reduces developer burden, and improves correctness.

This also moves to first-class DocumentRoot objects, and moves calls
with complex side effects to be ContentProvider.call() invocations,
offering more granular permission control over Uri operations that
shouldn't be available through Uri grants.

This new design also relaxes the requirement that root information be
burned into every Uri.  Migrate ExternalDocumentsProvider and
DocumentsUI to adopt new API.

Bug: 10497206
Change-Id: I6f2b3f519bfd62a9d693223ea5628a971ce2e743
2013-08-28 20:49:42 -07:00
Alan Viverette
9896fce07b am de16f5f6: am b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
* commit 'de16f5f6056aecdc37c9b475157545862dbf3166':
  Fix documentation regarding defStyle in View constructor
2013-08-28 18:23:12 -07:00
Alan Viverette
de16f5f605 am b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
* commit 'b432ca60c6c7af42989db28594137f6fe1e888b4':
  Fix documentation regarding defStyle in View constructor
2013-08-28 18:17:31 -07:00
Alan Viverette
b432ca60c6 Merge "Fix documentation regarding defStyle in View constructor" into klp-dev 2013-08-29 01:15:48 +00:00
John Spurlock
44046e6c69 am 0d669d6d: am ab8fe692: Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
* commit '0d669d6d6710dd25f9e725f43de957c21a974625':
  Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
2013-08-28 18:07:39 -07:00
John Spurlock
0d669d6d67 am ab8fe692: Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
* commit 'ab8fe692961bb3bf71169fd7a43aff4de837ab26':
  Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
2013-08-28 18:04:25 -07:00
John Spurlock
ab8fe69296 Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev 2013-08-29 01:00:03 +00:00
Chet Haase
8314be5784 am 3ddc33e2: am 52485b0b: Merge "Better transition interruption and TextChange fixes" into klp-dev
* commit '3ddc33e26cc10705169f47b57ef9dcefda1ef2ab':
  Better transition interruption and TextChange fixes
2013-08-28 17:00:40 -07:00
Alan Viverette
fb410d219f Fix documentation regarding defStyle in View constructor
BUG: 8912583
Change-Id: Ib8b1f8baa4ee98aae0e66edc547ab014b2401415
2013-08-28 16:57:42 -07:00
Chet Haase
3ddc33e26c am 52485b0b: Merge "Better transition interruption and TextChange fixes" into klp-dev
* commit '52485b0b7ef066241371393dc6060bccd090a222':
  Better transition interruption and TextChange fixes
2013-08-28 16:57:31 -07:00
Isaac Katzenelson
cdcdd6d941 am b889b546: am 18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
* commit 'b889b546e88feb7c5da0ba67227b15a47413bd2c':
  Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.
2013-08-28 16:57:07 -07:00
Chet Haase
52485b0b7e Merge "Better transition interruption and TextChange fixes" into klp-dev 2013-08-28 23:55:10 +00:00
Isaac Katzenelson
b889b546e8 am 18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
* commit '18f590a9b7d2690e5f4189d8d0c025ff1a5bf199':
  Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.
2013-08-28 16:54:02 -07:00
Chet Haase
af78bdd615 Better transition interruption and TextChange fixes
Previously, the TextChange transition didn't handle interruption/
cancellation at all, which made it problematic to use in any real
situation where a transition might get interrupted mid-animation.
Also, the way that it side-effected the text of TextView objects caused
errors in the UI when the transition was interrupted, because it would
not clean up after itself properly as new transitions queried the
current state of the UI.

Also, the prior cancellation logic for all transitions was not quite
correct; we were pausing transitions but resuming the animations, making it
tricky to write transitions that would restore state correctly.

Change-Id: I5a9f3c915e9834ec59ce1e1c3c96a88d11e4aa1b
2013-08-28 16:50:13 -07:00
Isaac Katzenelson
18f590a9b7 Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev 2013-08-28 23:49:41 +00:00
Sandeep Siddhartha
84a242d1b5 am 529763b6: am bd31a483: Merge "Tweak the HotwordRecognizer API" into klp-dev
* commit '529763b690bc97e1db5858aaf81b2e5b0ceaca7d':
  Tweak the HotwordRecognizer API
2013-08-28 16:45:43 -07:00
Sandeep Siddhartha
529763b690 am bd31a483: Merge "Tweak the HotwordRecognizer API" into klp-dev
* commit 'bd31a483d358b02e4a16949b576560d4e0672ea3':
  Tweak the HotwordRecognizer API
2013-08-28 16:43:41 -07:00
Sandeep Siddhartha
bd31a483d3 Merge "Tweak the HotwordRecognizer API" into klp-dev 2013-08-28 23:39:00 +00:00
Sandeep Siddhartha
823393477b Tweak the HotwordRecognizer API
- Make it more intuitive by enforcing callers to set a listener while
  starting recognition
- Fix TODO to resolve the ComponentName if none is provided
- Unbind from the Hotword service if stopRecognition is called
- Get rid of the callback in onStopHotwordRecognition

Change-Id: I8edad0ef0f3671283aeb51eaed1d3b8dab01baa0
2013-08-28 16:27:36 -07:00
Fabrice Di Meglio
a31d3fa293 am f73df21a: am 627dd9b5: Merge "Fix bug #10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data" into klp-dev
* commit 'f73df21a8e311ab72a00dbdb0b1dbd8e8d79a143':
  Fix bug #10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data
2013-08-28 14:07:07 -07:00
Alan Viverette
c5c4809c95 am c971f040: am ce9e2526: Merge "Implement new accessibility APIs in lists, text view" into klp-dev
* commit 'c971f0406771faa6398f21e7b5a5a58cd4cba1fd':
  Implement new accessibility APIs in lists, text view
2013-08-28 14:06:30 -07:00
Alan Viverette
167bba4cbd am b27239b4: am 116c12ef: Merge "Add public API for obtaining drag-to-open listener" into klp-dev
* commit 'b27239b4ca4b336c8e7a482212ee54643e660795':
  Add public API for obtaining drag-to-open listener
2013-08-28 14:06:17 -07:00