111229 Commits

Author SHA1 Message Date
Vinit Deshapnde
1d1319e3e1 Don't restore EAP-TLS networks from backup
Since they need certificates that are not backed up/restored; restoring
them is not that useful.

Bug: 6544151

Change-Id: Ida1a98dc4f01ec1883ce7f76e52f87a27cc814cc
2013-09-06 17:12:41 -07:00
Svetoslav
2def614854 Merge "Hiding some unneeded APIs," into klp-dev 2013-09-05 17:01:39 +00:00
Andy McFadden
63571bf203 Merge "Add #! to 'am' shell script" into klp-dev 2013-09-05 17:00:05 +00:00
Svetoslav
a76233ae84 Hiding some unneeded APIs,
1. Hide the MediaSize and Resolution constructors that take
   package and resource Id.

2. Fix a bug and docs in creating portrait and landscape media
   size.

Change-Id: If59992e355391de6ad6d14d4f7b3be8c8b6cc0e0
2013-09-05 09:50:28 -07:00
Tom O'Neill
cef05c28eb Incorporate new API council comments
- Split getStatus() into onGetSummary() and onGetEnabled()

- Call them on app's UI thread

- Allow runtime exceptions to propagate up

- Make a couple of more methods final to prevent subclasses from playing
around with the intent

- Remove explicit timing requirement from javadoc

- Mention that this will be restricted to system-image apps (will be
enforced by the actual settings code)

- b/10461474

Change-Id: Id22dd7a707c05de396ae4c5810e839ca734714c0
2013-09-05 09:45:03 -07:00
John Spurlock
9e8bdc39bc Merge "Force the nav bar visible when an IME window is visible." into klp-dev 2013-09-05 14:16:55 +00:00
John Spurlock
9e7884a091 Force the nav bar visible when an IME window is visible.
Bug:9499956
Change-Id: I1ed895c6283476440b6c47e1764b6b0fe2aa949a
2013-09-05 09:37:56 -04:00
John Spurlock
3e17843dd0 Remove obsolete indicator icons.
Bug:10607423
Change-Id: I8d4e1037edf2394a1065c9b0a85a1f3e3c21e70e
2013-09-05 07:32:54 -04:00
Tim Murray
d2676f9bd9 Merge "Add YUV element convenience function." into klp-dev 2013-09-05 07:36:43 +00:00
Svetoslav
c5c203d6ef Merge "Print API updated." into klp-dev 2013-09-05 05:36:51 +00:00
Dirk Dougherty
2069b00416 am 76fcf6c7: am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '76fcf6c73e7dda99ec80e6da616bee26c2a088e6':
  Add a few more samples to browser.
2013-09-04 22:29:02 -07:00
Dirk Dougherty
76fcf6c73e am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '07c9bcc3a60a8860b65aa43badd8ab1f1858522b':
  Add a few more samples to browser.
2013-09-04 22:26:54 -07:00
Dirk Dougherty
07c9bcc3a6 am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '4ef51c3c4298cbd7980029b6b1cad2f6696f7bb5':
  Add a few more samples to browser.
2013-09-04 22:23:48 -07:00
Dirk Dougherty
4ef51c3c42 Merge "Add a few more samples to browser." into jb-mr2-docs 2013-09-05 05:19:41 +00:00
Svetoslav Ganov
533e118f5a Merge "Addressing API councing suggestions for com.android.printservice" into klp-dev 2013-09-05 05:09:56 +00:00
Dirk Dougherty
2826df3f3d Add a few more samples to browser.
Change-Id: Iac7acc22a8dd71950b32e2c35c82f53abc34168a
2013-09-04 21:55:47 -07:00
Svetoslav
773f54de3d Print API updated.
1. Removed the updatePrinters API on PrinterDiscoverySession.
   Now re-adding a printer updates it.

2. Added getTrackedPrinters() API to allow a print service to
   figure out which printers' state should be tracked by the
   service.

3. Removed the APIs on PrintDocumentInfo that describe the
   layout of the content as they are not needed. For example,
   if the print attributes passed in layout require landscape
   mode, the the app should just create a PDF page with the
   wider side up and draw its content in portrait. The printer
   will then rotate the page.

Change-Id: Idd72c6e9c129e8b17eef1236573a99773f8ff0a2
2013-09-04 21:06:12 -07:00
Jeff Sharkey
7f95595fe7 Merge "Asset drop, icons for common MIME types." into klp-dev 2013-09-05 03:04:18 +00:00
Jeff Sharkey
b145ac127a Merge "Fix document management permission enforcement." into klp-dev 2013-09-05 03:04:09 +00:00
John Spurlock
eebf6895fd Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev 2013-09-05 02:44:29 +00:00
John Spurlock
322d77185d Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
This reverts commit 5e777f668526104e7dd97d3972d35eb7b9eef5a2.

Change-Id: I6dc00f376cbbe34dafde3470d8e06c9123f81d8d
2013-09-05 02:39:46 +00:00
Svetoslav Ganov
adade10a51 Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev 2013-09-05 02:27:32 +00:00
John Spurlock
0e907e8350 Merge "SystemUI demo mode." into klp-dev 2013-09-05 02:19:19 +00:00
John Spurlock
079db74874 Merge "Remove signal/wifi activity indicator icon overlays." into klp-dev 2013-09-05 02:18:31 +00:00
John Spurlock
631228b024 Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 2013-09-05 02:09:29 +00:00
John Spurlock
a6fdd7f2ea Merge "SystemUI asset update." into klp-dev 2013-09-05 02:02:53 +00:00
John Spurlock
7436f07eb5 SystemUI asset update.
Plus a few framework resources used as status icons.

Bug:10502089
Change-Id: I66d3bcbb408a8e008cbb383cb3a1a55f97d3d64c
2013-09-04 21:52:37 -04:00
Jeff Sharkey
0b14db3cf5 Asset drop, icons for common MIME types.
Bring in latest assets from UX. Map common MIME types to specific
icons.

Bug: 10510022
Change-Id: I01ea8749ca5515a04efcbc15eb0c8cbb43e5e7ad
2013-09-04 18:46:56 -07:00
Jeff Sharkey
e37ea6123d Fix document management permission enforcement.
Allow both explicit holders of the MANAGE_DOCUMENTS permission and
those holding Uri grants to perform management tasks.

Extend grants for newly created documents when caller doesn't have
permission.  Revoke grants when deleting documents.

Test now writes actual content into picked file.  Workaround updated
flags for Drive app.

Bug: 10623211
Change-Id: Ia8e90b33e0fac8294b2cacb96d083c43fdf75aab
2013-09-04 18:43:34 -07:00
Ruben Brunk
f267dd1d79 Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 2013-09-05 01:23:40 +00:00
Dianne Hackborn
8144585c58 Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 2013-09-05 01:21:32 +00:00
Wink Saville
e4bcd1b714 am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout.
* commit '323af8b49df3535977b5aa7f5b31c429d8a50f10':
  Add provisioning apn timeout.
2013-09-04 18:17:15 -07:00
Wink Saville
323af8b49d am aa5b0f8b: am ce1e3798: Add provisioning apn timeout.
* commit 'aa5b0f8bdadcfa1ddb041e09b815ea4b5986e901':
  Add provisioning apn timeout.
2013-09-04 18:14:07 -07:00
Wink Saville
aa5b0f8bda am ce1e3798: Add provisioning apn timeout.
* commit 'ce1e37981caec29df2671a6e2909f00da7f24a00':
  Add provisioning apn timeout.
2013-09-04 18:11:07 -07:00
Sandeep Siddhartha
228b35109a Merge "Move the hotword code to KeyguardHostView" into klp-dev 2013-09-05 01:08:23 +00:00
Dianne Hackborn
49021f5f79 Fix issue #10422349: Limit/change the battery history data in batterystats
Don't include history in real checkins; have a new compact option
for bug reports.

Change-Id: I077f9218b365154f6bae9cc685c2c6b378e0283a
2013-09-04 18:03:40 -07:00
Dianne Hackborn
7f71206d00 Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 2013-09-05 00:53:27 +00:00
Sandeep Siddhartha
eec83dcadd Move the hotword code to KeyguardHostView
- Try hotword detection on Pattern unlock screen as well - disabled in
  this CL
- Explicitly stop hotword detection when starting the assist intent.

Change-Id: I3d22a9029abf888431113b86e4410ea9e9866c57
2013-09-04 17:47:34 -07:00
Dianne Hackborn
b811e64cb3 Fix issue #10461600: KLP API Review: UndoManager
Hide, hide, hide!

Change-Id: Ie04825723d9392a4258e2d738828201ee387f7c6
2013-09-04 17:43:56 -07:00
Chet Haase
49ee555f23 Merge "Transition API changes from API council recommendations" into klp-dev 2013-09-04 23:47:45 +00:00
Tim Murray
932e78e990 Add YUV element convenience function.
Change-Id: Ie67dfba6a4c4f1913875ad9817c53e45d56809ae
2013-09-04 16:15:45 -07:00
Scott Main
52ea7f57ed am f56076ee: am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit 'f56076eefba47dad9b66b3011f487dc9a22e2756':
  update dashboards for 9/13
2013-09-04 15:43:40 -07:00
Scott Main
f56076eefb am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '966b9d467dbb21d7bbc0a49067110ff4ddaffb89':
  update dashboards for 9/13
2013-09-04 15:40:27 -07:00
Andy McFadden
c0046f2167 Add #! to 'am' shell script
Shell script needs to start with #! for exec().

Bug 10606037

Change-Id: I594da6f0433e838dcf5b45b991188ceaa52d9bd1
2013-09-04 15:39:51 -07:00
Michael Wright
9f8c2d229f Merge "Fix keymap build dependencies and variable name collisions" into klp-dev 2013-09-04 22:37:05 +00:00
Scott Main
966b9d467d am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '002057bf0452168fd88eb81c2d36f02cfb260769':
  update dashboards for 9/13
2013-09-04 15:36:59 -07:00
Scott Main
002057bf04 Merge "update dashboards for 9/13" into jb-mr2-docs 2013-09-04 22:35:04 +00:00
Glenn Kasten
04c58e9ec1 Merge "Java API for AudioTrack timestamps" into klp-dev 2013-09-04 22:29:19 +00:00
Glenn Kasten
948c2e6ff4 Java API for AudioTrack timestamps
This change adds android.media.AudioTimestamp and
android.media.AudioTrack.getTimestamp, with implementation, but hidden.

Change-Id: Ic314f04ff775baca05c57d19b5ea91133dbd0be1
2013-09-04 15:23:27 -07:00
Scott Main
847480c6d1 update dashboards for 9/13
Change-Id: I50171e5448fa062ed59d585c603cb5ac80f80d47
2013-09-04 15:08:40 -07:00