121891 Commits

Author SHA1 Message Date
Andrew Solovay
81be9239fd am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC.
* commit 'bd8ca9f9adf10a5b7e1e04ed139e4108758e286f':
  docs: Added "Verifying for ART" to TOC.
2014-06-13 18:25:53 +00:00
Justin Koh
dd5c947170 Revert "Close ActivityView and ActivityContainer cleanly."
This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
2014-06-13 09:55:09 -07:00
Robert Ly
09e2459cc3 Merge "docs: Added info on customizing the status bar." into klp-modular-dev 2014-06-12 03:30:50 +00:00
Ricardo Cervera
d3e426bebd docs: Review the User Interface section for the L API Preview
Change-Id: Ied0002d5c4b0a29919be28f2feb04a419c563160
2014-06-15 16:01:28 -07:00
Ricardo Cervera
239d09276b docs: Added info on customizing the status bar.
Change-Id: I345fc253057e2abe8284ef4b1f5f3744081424bf
2014-06-15 15:32:30 -07:00
Dirk Dougherty
b024fd2087 am bdcd6fc7: Doc change: Update monetization docs.
* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.
2014-06-12 02:37:27 +00:00
Dirk Dougherty
bdcd6fc777 Doc change: Update monetization docs.
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
2014-06-11 17:52:07 -07:00
Scott Main
55c11af78a Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 2014-06-11 21:23:31 +00:00
Andrew Solovay
25b8af9d3f am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:23:31 +00:00
Scott Main
4795031492 reorg the SDK setup docs to streamline setup for all variations.
Move ADT plugin to the ADT help doc and combine the three setup guides
into one page that is dynamic based on a URL parameter.

Change-Id: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
2014-06-11 20:17:05 -07:00
Dirk Dougherty
460cab199d am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
* commit 'b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad':
  Doc change: Update monetization docs.
2014-06-12 02:41:07 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
2014-06-11 16:33:00 -07:00
Craig Mautner
e33010a261 Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 2014-06-11 08:41:11 +00:00
Griff Hazen
9f637d1095 Reduce notification service historical archive size to 1 for watches.
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
2014-06-10 15:31:48 -07:00
Deepanshu Gupta
92b7c67e71 Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev 2014-06-10 21:55:02 +00:00
Deepanshu Gupta
9c80488e11 LayoutLib fixes for API 20 [DO NOT MERGE]
Fixes a bunch of issues with delegate method signatures.

Also cherrypicked commit 664d6f1fe4d6dfa742b3e98051f924dbc190f8ca
which is needed in this branch also.

Bug: 15492736
Change-Id: If99ff279b0d0cabe22942da27388ecb4b800c330
2014-06-12 19:48:38 +00:00
Andrew Solovay
ded9c171ea Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 2014-06-10 21:32:31 +00:00
Craig Mautner
e6d80f4ce4 Add NO_ANIMATION flag to ActivityView Intents.
Add Intent.FLAG_ACTIVITY_NO_AMINATION to all Intents passed into
ActivityView.

Fixes bug 15393526.

Change-Id: I1899a5019416109e982f0254aaba410bb1f4a38d
2014-06-10 13:31:02 -07:00
Robert Ly
748856f2d9 am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
* commit 'a7ddd0292420c2e8869e093d8bdad5cdc1f199cc':
  Add documentation for AndroidKeyStore
2014-06-10 02:49:18 +00:00
Robert Ly
a7ddd02924 am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
* commit '80e84e2db92ba190c6c517dd4c71cd12c0adb249':
  Add documentation for AndroidKeyStore
2014-06-10 02:44:08 +00:00
Robert Ly
80e84e2db9 am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
  Add documentation for AndroidKeyStore
2014-06-10 02:39:28 +00:00
Robert Ly
f3cecfa218 am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
* commit '55d525b26b716351625798675afe69c6cf43cf5a':
  Add documentation for AndroidKeyStore
2014-06-10 02:36:10 +00:00
Robert Ly
55d525b26b am 716cc7dc: Add documentation for AndroidKeyStore
* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
  Add documentation for AndroidKeyStore
2014-06-10 02:32:29 +00:00
Justin Koh
42c53fd646 Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev 2014-06-10 01:05:05 +00:00
Aaron Whyte
83955cb260 Catch OperationUnsupportedException when linkifying using WebView
This fixes a CTS test for Wearable. We cannot check for FEATURE_WEBVIEW, because
there's no way to get a PackageManager from within these static methods.
Bug: 15131296

Change-Id: I7bf7564b6209f330a413ed54a94be1e07fedb30d
2014-06-09 17:59:03 -07:00
Justin Koh
b7c39cee9e Remove WebIconDatabase calls from android.provider.Browser
This class has been deprecated, so no need to call it.

Bug: 15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb
2014-06-09 17:50:34 -07:00
Amit Mahajan
3f175a3587 am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.
* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
  Handle provisioning APN by turning off/on radio.
2014-06-09 19:50:09 +00:00
Amit Mahajan
e5a28d34f6 am 20c5ce50: Handle provisioning APN by turning off/on radio.
* commit '20c5ce50c456742bf912ebb915be45bfdb51487d':
  Handle provisioning APN by turning off/on radio.
2014-06-09 19:46:01 +00:00
Justin Koh
eba8782a1f Add NPE check to getSystemWindowInsets
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
2014-06-09 11:31:53 -07:00
Justin Koh
a5de8479f4 Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 2014-06-09 18:29:39 +00:00
Justin Koh
b4be02088f Fix Browser when running on a platform without webview
Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug: 15088030

Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916
2014-06-09 11:28:53 -07:00
Amit Mahajan
20c5ce50c4 Handle provisioning APN by turning off/on radio.
The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
2014-06-09 17:55:27 +00:00
Andrew Solovay
220cf297d8 docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
Contains information for developers to make sure their apps work properly
with the ART runtime.

This doc is staged to:

http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html

This is intended to be a companion to the newly-expanded "Introducing ART"
doc on source.android.com (http://ag/469776), which has general information
about ART's new features.

Change-Id: I77c6e552cfedb13dee1d256fec15926fffcbbbb3
2014-06-09 10:10:27 -07:00
Robert Ly
e70609c87e am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs
* commit '5cb180541332d652ed661559dfaa55a0fcc3751b':
  remove erroneous file
2014-06-09 16:54:45 +00:00
Robert Ly
91c5ce318f fix javadocs b/14414251
Change-Id: I0a0b8f1c42c45b9e7b6c5282c864319cf0278f14
2014-06-08 15:37:00 -07:00
Robert Ly
5cb1805413 am e115755d: Merge "remove erroneous file" into klp-docs
* commit 'e115755d0fbd067a1996eb448cda58a14cce22d1':
  remove erroneous file
2014-06-08 08:35:23 +00:00
Robert Ly
e115755d0f Merge "remove erroneous file" into klp-docs 2014-06-08 05:39:55 +00:00
Robert Ly
6ee94e5388 remove erroneous file
Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388
2014-06-07 22:38:18 -07:00
Adam Lesinski
4d9fcae202 Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 2014-06-06 21:13:16 +00:00
Michael Kolb
4bdc93d63e Merge "Remove circular mask" into klp-modular-dev 2014-06-06 15:26:17 +00:00
Vinod Krishnan
90e96db0b5 Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev 2014-06-05 23:03:49 +00:00
Prashant Malani
42db3761c9 Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev 2014-06-05 23:03:19 +00:00
Vinod Krishnan
b0e5bbb657 Adding a way to stub Vpn ConfirmDialog
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486

Bug: 15087985

Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
2014-06-05 15:28:50 -07:00
Prashant Malani
448a4e59ad DO NOT MERGE Change display state modification during dozing
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
2014-06-05 22:25:23 +00:00
Justin Koh
89b6bf5a11 DO NOT MERGE Readd removal of notification listener limit on posting
Listener packages are allowed to post > 50 notifications

This reverts commit 500a6b0ca68aaad6140b5af2dae94349be9f7aeb.
2014-06-05 13:50:58 -07:00
Michael Kolb
2e8b27e898 Remove circular mask
Change-Id: I83b1caea100d28be2fca46dc0280b05e9b78da44
2014-06-05 12:49:55 -07:00
Justin Koh
8200b667ea Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev 2014-06-05 19:03:33 +00:00
Justin Koh
500a6b0ca6 Revert "Add check to allow notification listener packages to post >50 notifications"
Broke build.

This reverts commit 2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d.

Change-Id: I2fdf1de21b6598f85bbd94acef44e771b2df9f42
2014-06-05 19:02:47 +00:00
Justin Koh
2be3d6f936 Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev 2014-06-05 18:06:46 +00:00
Hui Lu
61c0f54733 Merge "Add interface name for proxy network type." into klp-modular-dev 2014-06-05 17:36:02 +00:00