OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "User should not be able to select unavailable printers." into klp-dev
Svetoslav [Tue, 24 Sep 2013 23:15:58 +0000 (23:15 +0000)]
Merge "User should not be able to select unavailable printers." into klp-dev

10 years agoUser should not be able to select unavailable printers.
Svetoslav [Tue, 24 Sep 2013 22:14:41 +0000 (15:14 -0700)]
User should not be able to select unavailable printers.

1. If the printer is unavailable we should not allow the user
   to select it. Rather, show it grayed out.

2. Some string changes requeted by translators.

bug:10917222

Change-Id: I370f05f9c8e70e3f077db7eb02cf48e19a59925d

10 years agoMerge "Replace blue highlight feedback with gray." into klp-dev
Rob Tsuk [Tue, 24 Sep 2013 22:44:38 +0000 (22:44 +0000)]
Merge "Replace blue highlight feedback with gray." into klp-dev

10 years agoMerge "Mirror DocumentsUI assets for RTL layouts" into klp-dev
Michael Wright [Tue, 24 Sep 2013 22:39:06 +0000 (22:39 +0000)]
Merge "Mirror DocumentsUI assets for RTL layouts" into klp-dev

10 years agoMerge "Fix monkey bugs in ListView" into klp-dev
Adam Powell [Tue, 24 Sep 2013 22:38:37 +0000 (22:38 +0000)]
Merge "Fix monkey bugs in ListView" into klp-dev

10 years agoMerge "Asset import from ux-assets" into klp-dev
Adam Powell [Tue, 24 Sep 2013 22:38:22 +0000 (22:38 +0000)]
Merge "Asset import from ux-assets" into klp-dev

10 years agoFix monkey bugs in ListView
Adam Powell [Tue, 24 Sep 2013 21:53:30 +0000 (14:53 -0700)]
Fix monkey bugs in ListView

* Don't run item click listeners as part of touch mode reset if the
  ListView is being detached from its window. Some calling code makes
  assumptions around this.

* Remove redundant state tracking for window attachment from
  AbsListView now that we have View#isAttachedToWindow(). The timing
  of View's mechanism is closer to what we want here anyway -
  subclasses calling super.onDetachedFromWindow() as the first line of
  an overridden onDetachedFromWindow() method will see the window as
  being in a detached state while the rest of the method runs,
  resulting in the behavior described in the first bullet point above.

Bug 10834897

Change-Id: Ic9fdff3c5cfc4996361a7fb1a863547b4d1a2c9c

10 years agoAsset import from ux-assets
Adam Powell [Tue, 24 Sep 2013 22:10:25 +0000 (15:10 -0700)]
Asset import from ux-assets

Import changed assets as detailed in bug 10496653

Change-Id: I53fd9479031e7eabb6480c58a26da6312fdb7ec7

10 years agoMerge "Fix issue #10848916: "Always" button is not working." into klp-dev
Dianne Hackborn [Tue, 24 Sep 2013 21:46:16 +0000 (21:46 +0000)]
Merge "Fix issue #10848916: "Always" button is not working." into klp-dev

10 years agoReplace blue highlight feedback with gray.
Rob Tsuk [Tue, 24 Sep 2013 21:16:51 +0000 (14:16 -0700)]
Replace blue highlight feedback with gray.

Change-Id: Idf95742261cdc19b25b0aa5e1e8c8cb9685e7fe5

10 years agoMerge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev
Alan Viverette [Tue, 24 Sep 2013 21:28:56 +0000 (21:28 +0000)]
Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev

10 years agoMerge "Remove Rect allocation in each layout pass." into klp-dev
John Spurlock [Tue, 24 Sep 2013 21:18:00 +0000 (21:18 +0000)]
Merge "Remove Rect allocation in each layout pass." into klp-dev

10 years agoFix issue #10848916: "Always" button is not working.
Dianne Hackborn [Tue, 24 Sep 2013 00:38:51 +0000 (17:38 -0700)]
Fix issue #10848916: "Always" button is not working.

The problem was that the ResolverActivity filters some activities
out of the list it shows, but it uses that display list as the
list of components the preference is set against when ultimately
setting it on the package manager...  but that filtered list is *not*
the right component set, since it is not the same as the package
manager's view on it.

The fix here is to retain the original set of matching components
and use that when setting the preferred activity.  Note that this
does mean that in very unusual cases where filtering is happeing
(such as one of the activities not being exported but being seen
as a possible completion from another app), then you will be setting
the preference for the complete set.  Ultimately we probably need
to have the package manager apply these filtering rules up-front so
this is all consistent, but this is a very rare case so not that
important.

And then most of the change here is just improving the debug
output for intent resolution.

Change-Id: Ie35ac2c05a45946439951bbf41433c8b7de79c05

10 years agoRemove Rect allocation in each layout pass.
John Spurlock [Tue, 24 Sep 2013 21:09:05 +0000 (17:09 -0400)]
Remove Rect allocation in each layout pass.

Bug:10786445
Change-Id: I0cb1ab7697f33e02adeb5319bae19d3a1d20753c

10 years agoMerge "Disable ActionBar usage of transitions" into klp-dev
Chet Haase [Tue, 24 Sep 2013 20:58:40 +0000 (20:58 +0000)]
Merge "Disable ActionBar usage of transitions" into klp-dev

10 years agoMerge "Multiple printer discovery session instances and other bugs." into klp-dev
Svetoslav [Tue, 24 Sep 2013 20:37:58 +0000 (20:37 +0000)]
Merge "Multiple printer discovery session instances and other bugs." into klp-dev

10 years agoMerge "Freshen restored stacks, more UX bug fixes." into klp-dev
Jeff Sharkey [Tue, 24 Sep 2013 20:34:39 +0000 (20:34 +0000)]
Merge "Freshen restored stacks, more UX bug fixes." into klp-dev

10 years agoFreshen restored stacks, more UX bug fixes.
Jeff Sharkey [Tue, 24 Sep 2013 19:07:12 +0000 (12:07 -0700)]
Freshen restored stacks, more UX bug fixes.

When restoring a persisted stack, such as last location or a location
where save occurred, freshen the DocumentStack to get the latest
details from backend, and ensure the path is still valid.

Filter Recent directories in create mode based on roots allowed by
incoming request.

Remember when user last picked an external app, and open drawer next
time user launches for GET_CONTENT.

Fix state list drawable ordering, and avoid clobbering Drawable
callback when wrapping in InsetDrawable; tricksy hobbitses!

Make grid items smaller to always fit two columns on phones.  Draw
grid items all the way to screen edge; don't clip to padding.  Better
error message when folder creation failed.  Show Recents in grid mode
when picking any visual content, not just images.

Bug: 10846100109032111089899310892808108920581089200910885012
Change-Id: Ia0f88d911abc6ea03645d6fd3e04271c21d5936a

10 years agoMirror DocumentsUI assets for RTL layouts
Michael Wright [Tue, 24 Sep 2013 01:40:08 +0000 (18:40 -0700)]
Mirror DocumentsUI assets for RTL layouts

Bug: 10641916
Change-Id: I037adeb5ec7df6e3812be8653929a55ed8b87323

10 years agoMerge "Fix method for determining focused window." into klp-dev
Craig Mautner [Tue, 24 Sep 2013 19:33:16 +0000 (19:33 +0000)]
Merge "Fix method for determining focused window." into klp-dev

10 years agoMerge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev
Lajos Molnar [Tue, 24 Sep 2013 18:37:12 +0000 (18:37 +0000)]
Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev

10 years agoMerge "Update AdapterView.performItemClick() documentation" into klp-dev
Alan Viverette [Tue, 24 Sep 2013 18:28:01 +0000 (18:28 +0000)]
Merge "Update AdapterView.performItemClick() documentation" into klp-dev

10 years agoFix NPE in PopupMenu.getDragToOpenListener()
Alan Viverette [Tue, 24 Sep 2013 18:27:08 +0000 (11:27 -0700)]
Fix NPE in PopupMenu.getDragToOpenListener()

BUG: 10912382
Change-Id: I206e697b4781c4d03ebc01aa675511d89c1656af

10 years agoMerge "Pause activities behind keyguard after boot." into klp-dev
Craig Mautner [Tue, 24 Sep 2013 17:39:17 +0000 (17:39 +0000)]
Merge "Pause activities behind keyguard after boot." into klp-dev

10 years agoPause activities behind keyguard after boot.
Craig Mautner [Mon, 23 Sep 2013 17:28:14 +0000 (10:28 -0700)]
Pause activities behind keyguard after boot.

Following boot the initial activity was automatically resumed even if
a lockscreen is obscuring it. Refer to CL 363859 for why this breaks
things.

This fix pauses all activities the first time a lockscreen appears.

Completes the fix for bug 10732489.

Change-Id: I6fcac14b574c495aa0e16d798cddc1263c6b4c25

10 years agoWebVttRenderer: allow BOM at beginning of a WebVTT file.
Lajos Molnar [Tue, 24 Sep 2013 16:35:47 +0000 (09:35 -0700)]
WebVttRenderer: allow BOM at beginning of a WebVTT file.

This is part of the spec.

Change-Id: I61ccc259c0b9d3a2bc4273925665d107b0c89c62
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10900755

10 years agoFix method for determining focused window.
Craig Mautner [Tue, 24 Sep 2013 00:37:09 +0000 (17:37 -0700)]
Fix method for determining focused window.

Method had been rewritten to be task-based and there were errors
when a task had no apptokens. New version is much easier to
maintain.

Maybe fixes bug 10689184.

Change-Id: I5e4c8447a33a4f5686296c20b9f9fe302c9ae49f

10 years agoMerge "Public API for peak and RMS monitoring through the Visualizer effect" into...
Jean-Michel Trivi [Tue, 24 Sep 2013 15:44:55 +0000 (15:44 +0000)]
Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 24 Sep 2013 14:59:27 +0000 (14:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 24 Sep 2013 14:59:07 +0000 (14:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 24 Sep 2013 14:58:06 +0000 (14:58 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Update WebView documentation section about zoom." into klp-dev
Martin Kosiba [Tue, 24 Sep 2013 09:49:21 +0000 (09:49 +0000)]
Merge "Update WebView documentation section about zoom." into klp-dev

10 years agoMultiple printer discovery session instances and other bugs.
Svetoslav [Tue, 24 Sep 2013 01:48:34 +0000 (18:48 -0700)]
Multiple printer discovery session instances and other bugs.

1. The fused printers provider was dropping on the floor received printers
    if it was not active. It is in fact a loaded and if not active it should compute
    the printers and not deliver them until activated. This fixes an issue where
    opening the print dialog, then enabling a print service results in the printers
    reported by the service not showing up in the print dialog.

2. Printer discovery session was created twice which leads to incorrect behavior
    as the pint system is designed around the contract that there is a single
    printer discovery session per service at a time. This was possible due to an
    incorrect initialization of a member variable resulting in double session creation
    when the print service is connected.

3. When a print service is enabled during discovery we did not use the correct
    condition to start printer discovery resulting in starting it all the time even if
    not needed. Also if some of the printers that had to be tracked are reported
    by the service just enabled (typically historical printers) we did not ask the
    service to start tracking them.

4. Removed some logging.

bug:10903343

Change-Id: I46c049471a4b099fc668df3aee2aaedc8d7786ac

10 years agoMerge "Camera2: replace EDQUOT with EUSERS" into klp-dev
Zhijun He [Tue, 24 Sep 2013 02:28:22 +0000 (02:28 +0000)]
Merge "Camera2: replace EDQUOT with EUSERS" into klp-dev

10 years agoMerge "Fit and finish for navbar camera affordance" into klp-dev
Jim Miller [Tue, 24 Sep 2013 01:30:59 +0000 (01:30 +0000)]
Merge "Fit and finish for navbar camera affordance" into klp-dev

10 years agoMerge "Enable RTL support in keyguard" into klp-dev
Jim Miller [Tue, 24 Sep 2013 00:08:05 +0000 (00:08 +0000)]
Merge "Enable RTL support in keyguard" into klp-dev

10 years agoEnable RTL support in keyguard
Jim Miller [Tue, 24 Sep 2013 00:01:14 +0000 (17:01 -0700)]
Enable RTL support in keyguard

Fixes bug 10799068

Change-Id: I353b135a2f5ea7cc061719414266cb47f1742db3

10 years agoPublic API for peak and RMS monitoring through the Visualizer effect
Jean-Michel Trivi [Mon, 23 Sep 2013 23:26:02 +0000 (16:26 -0700)]
Public API for peak and RMS monitoring through the Visualizer effect

Public API to extend the capabilities of the Visualizer audio
  effect with measurements of peak and RMS values.

Bug 8413913

Change-Id: Ifc6646e013ec55fde3523fab685add1d043f1272

10 years agoMerge "Fix broken method WorkSource.set (names aren't applied)." into klp-dev
David Christie [Mon, 23 Sep 2013 23:09:12 +0000 (23:09 +0000)]
Merge "Fix broken method WorkSource.set (names aren't applied)." into klp-dev

10 years agoMerge "The current is printer not refreshed when selected." into klp-dev
Svetoslav Ganov [Mon, 23 Sep 2013 23:04:31 +0000 (23:04 +0000)]
Merge "The current is printer not refreshed when selected." into klp-dev

10 years agoFix broken method WorkSource.set (names aren't applied).
David Christie [Mon, 23 Sep 2013 22:59:21 +0000 (15:59 -0700)]
Fix broken method WorkSource.set (names aren't applied).

Change-Id: I89273b99e312e48adc10debbb4e40d8684cceb23

10 years agoMerge "Add audio level monitoring capabilities in Visualizer effect" into klp-dev
Jean-Michel Trivi [Mon, 23 Sep 2013 22:58:53 +0000 (22:58 +0000)]
Merge "Add audio level monitoring capabilities in Visualizer effect" into klp-dev

10 years agoThe current is printer not refreshed when selected.
Svetoslav Ganov [Mon, 23 Sep 2013 22:51:03 +0000 (15:51 -0700)]
The current is printer not refreshed when selected.

Every time a printer is selected we have to refresh it by telling
the print service to stop tracking the previously selected printer
if such and start tracking the current one. As a result of start
tracking the print service has to give us the capabilities too. A
previous patch caused a regression and we do not refresh printers
when needed.

bug:10898968

Change-Id: I9d5413e324fdb8856ef61849d36a161470eb204d

10 years agoMerge "Implement issue #10895990: Better durations for proc stats" into klp-dev
Dianne Hackborn [Mon, 23 Sep 2013 22:10:08 +0000 (22:10 +0000)]
Merge "Implement issue #10895990: Better durations for proc stats" into klp-dev

10 years agoMerge "Add RIL_REQUEST_SET_INITIAL_ATTACH_APN." into klp-dev
Wink Saville [Mon, 23 Sep 2013 21:56:43 +0000 (21:56 +0000)]
Merge "Add RIL_REQUEST_SET_INITIAL_ATTACH_APN." into klp-dev

10 years agoAdd RIL_REQUEST_SET_INITIAL_ATTACH_APN.
Wink Saville [Mon, 23 Sep 2013 21:53:25 +0000 (14:53 -0700)]
Add RIL_REQUEST_SET_INITIAL_ATTACH_APN.

Bug: 9626411
Change-Id: I0c278d9f4c6fd7e12c495c2411ab94ac87e1f316

10 years agoDisable ActionBar usage of transitions
Chet Haase [Mon, 23 Sep 2013 18:26:36 +0000 (11:26 -0700)]
Disable ActionBar usage of transitions

Various artifacts across apps were coming from ActionBar's use of
the new transitions framework. Disabling transitions for now to get
things back to a more stable state.

Also, fixed some related bugs in transitions themselves, including
a change in TextChange to account for text selection, which was causing
errors in Keep's SearchView.

Issue #10860557 TextChange animator may old stale value
Issue #10819685 sometimes icons are lighter
Issue #10750525 Share and Settings icons overlap when stopping slideshow
Issue #10839551 Sometimes the search text box is right-aligned in Keep
Issue #10727484 Cursor incorrectly positioned after entering first letter during search action in keep app

Change-Id: Iad7cbf3297e18018308b8148b3519b032e63dace

10 years agoImplement issue #10895990: Better durations for proc stats
Dianne Hackborn [Mon, 23 Sep 2013 21:39:23 +0000 (14:39 -0700)]
Implement issue #10895990: Better durations for proc stats

Reduce the batching down to 3 hours, so that we can show shorter
durations in the UI.

Change-Id: I46af674b0024b828595ed3cdad2b47fe47d71ed8

10 years agoMerge "Allow saving to Downloads." into klp-dev
Jeff Sharkey [Mon, 23 Sep 2013 21:28:07 +0000 (21:28 +0000)]
Merge "Allow saving to Downloads." into klp-dev

10 years agoAllow saving to Downloads.
Jeff Sharkey [Mon, 23 Sep 2013 21:23:41 +0000 (14:23 -0700)]
Allow saving to Downloads.

Uses new column to mark writability.  Also filter file selection in
create mode to only allow writable files.

Bug: 1066716410893268
Change-Id: I90f74efbb7ac634fbdb3cc02a904a96a434d3605

10 years agoMerge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev
Amith Yamasani [Mon, 23 Sep 2013 21:14:51 +0000 (21:14 +0000)]
Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev

10 years agoAdd audio level monitoring capabilities in Visualizer effect
Jean-Michel Trivi [Fri, 20 Sep 2013 17:48:55 +0000 (10:48 -0700)]
Add audio level monitoring capabilities in Visualizer effect

Extend the visualizer audio effect with the capability to query
 peak and RMS values for the currently playing audio.
Values are expressed in mB and are retrieved as an array of
 int values in the native layer, and written directly as
 object fields for the JNI.

Bug 8413913

Change-Id: I808075a18e61f85c566544a2bdaae10e5c4a644b

10 years agoam 50756ccc: am 77364631: am a9fcf662: Merge "New Scheduling class." into jb-mr2...
Katie McCormick [Mon, 23 Sep 2013 20:50:39 +0000 (13:50 -0700)]
am 50756ccc: am 77364631: am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs

* commit '50756cccc05b77be0d19506a891415d192282db7':
  New Scheduling class.

10 years agoam 77364631: am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs
Katie McCormick [Mon, 23 Sep 2013 20:47:14 +0000 (13:47 -0700)]
am 77364631: am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs

* commit '7736463172804b054e75a9a4911c061c30d00347':
  New Scheduling class.

10 years agoam a9fcf662: Merge "New Scheduling class." into jb-mr2-docs
Katie McCormick [Mon, 23 Sep 2013 20:43:42 +0000 (13:43 -0700)]
am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs

* commit 'a9fcf6620d418268ab3e9ee8b13b37e85825e6f8':
  New Scheduling class.

10 years agoMerge "New Scheduling class." into jb-mr2-docs
Katie McCormick [Mon, 23 Sep 2013 20:40:46 +0000 (20:40 +0000)]
Merge "New Scheduling class." into jb-mr2-docs

10 years agoMerge "Introduce transparent bars to the keyguard." into klp-dev
John Spurlock [Mon, 23 Sep 2013 20:37:29 +0000 (20:37 +0000)]
Merge "Introduce transparent bars to the keyguard." into klp-dev

10 years agoUnmarshall PFDs properly when hand-crafting interface stubs
Amith Yamasani [Mon, 23 Sep 2013 18:16:28 +0000 (11:16 -0700)]
Unmarshall PFDs properly when hand-crafting interface stubs

ParcelFileDescriptors now carry an optional socket fd to communicate
close events. So, make sure that the correct creator is called when
reconstructing parceled PFDs.

Bug: 10759966
Change-Id: Ic6b9ffb8cb7af5f3a12440def595f74682231866

10 years agoCamera2: replace EDQUOT with EUSERS
Zhijun He [Mon, 23 Sep 2013 20:07:57 +0000 (13:07 -0700)]
Camera2: replace EDQUOT with EUSERS

Bug: 10838065
Change-Id: Ib450fcfffecec210c7f11842bf024abd7889bad7

10 years agoMerge "Upload fsck logs to the dropbox when error found" into klp-dev
Ken Sumrall [Mon, 23 Sep 2013 20:07:10 +0000 (20:07 +0000)]
Merge "Upload fsck logs to the dropbox when error found" into klp-dev

10 years agoMerge "Fix issue #10876433: java.lang.IllegalStateException in..." into klp-dev
Dianne Hackborn [Mon, 23 Sep 2013 20:05:45 +0000 (20:05 +0000)]
Merge "Fix issue #10876433: java.lang.IllegalStateException in..." into klp-dev

10 years agoFix issue #10876433: java.lang.IllegalStateException in...
Dianne Hackborn [Mon, 23 Sep 2013 20:00:23 +0000 (13:00 -0700)]
Fix issue #10876433: java.lang.IllegalStateException in...

...ActivityManagerService.updateLruProcessInternalLocked on bluetooth

Don't try to move process records associated with dead service
connections.

Technically we should probably be clearing the binding/service's
app entry so we don't get into this case, but the least intrusive
change for now is this check.

Change-Id: I6683e692eb5a8fa4f8ec1fa31bd63ec3d7f878ef

10 years agoIntroduce transparent bars to the keyguard.
John Spurlock [Sat, 21 Sep 2013 22:41:53 +0000 (18:41 -0400)]
Introduce transparent bars to the keyguard.

Driven by a new framework config bool. Tested on all layouts,
but disabled by default.  Can be enabled with a config overlay.

(Sliding/MultiPane)ChallengeLayout have custom measure/layout
logic that peeks at the root view's padding (!).  So we must keep
the root view's padding = system window insets. However, we need
the scrims + the fullscreen camera widget preview to use the entire
display size if the bars are transparent.

So the approach is to maintain the root view's
(KeyguardViewManager$ViewManagerHost) padding as before via
setFitsSystemWindows(true) but allow non KeyguardHostViews to
extend into the padding if bars are transparent via a custom
measure/draw on the root view.

KeyguardHostView background + challege scrims moved up to the
root view.

Also:
- Remove logspam line for fixed bug.

- Fix status bar staying opaque on interaction on secure keyguard.

Known issues:
- Nav bar blip dismissing global actions, keyguard app widget picker
bars are opaque.  Both will use the new inherit flag once it exists.

- Emergency dialer layout dance, will be fixed in the phone project.

Bug:10606085
Change-Id: I2648b4ee9a54a67324ce9dcbab976ad4da4bbcfa

10 years agoMerge "Fix Java API error where requesting another style for a provided family fails...
Derek Sollenberger [Mon, 23 Sep 2013 19:14:57 +0000 (19:14 +0000)]
Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev

10 years agoMerge "Work on issue #10759595: preferred tag doesn't prevent..." into klp-dev
Dianne Hackborn [Mon, 23 Sep 2013 18:10:27 +0000 (18:10 +0000)]
Merge "Work on issue #10759595: preferred tag doesn't prevent..." into klp-dev

10 years agoWork on issue #10759595: preferred tag doesn't prevent...
Dianne Hackborn [Mon, 23 Sep 2013 18:08:52 +0000 (11:08 -0700)]
Work on issue #10759595: preferred tag doesn't prevent...

...activity chooser from being shown

Add more useful output when intent filter debugging is enabled.

Change-Id: I3722b03ed625046398e81233cf7fb6aa5ded5eca

10 years agoMerge "Ensure that activities behind keyguard are paused." into klp-dev
Craig Mautner [Mon, 23 Sep 2013 17:46:30 +0000 (17:46 +0000)]
Merge "Ensure that activities behind keyguard are paused." into klp-dev

10 years agoMerge "Allow yet another combination of key management options" into klp-dev
Vinit Deshapnde [Mon, 23 Sep 2013 17:46:00 +0000 (17:46 +0000)]
Merge "Allow yet another combination of key management options" into klp-dev

10 years agoMerge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev
Matthew Williams [Mon, 23 Sep 2013 17:35:16 +0000 (17:35 +0000)]
Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Sep 2013 17:05:49 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie40261bd13b7f152487449fdbc0313c2c65472e3
Auto-generated-cl: translation import

10 years agoNew Scheduling class.
Katie McCormick [Thu, 5 Sep 2013 21:46:20 +0000 (14:46 -0700)]
New Scheduling class.

Change-Id: Iadd9d0d1d3bb8fa6a145d68ee28ae9912a6a9f4c

10 years agoMerge "Page ranges not correct in come cases." into klp-dev
Svetoslav [Mon, 23 Sep 2013 16:53:52 +0000 (16:53 +0000)]
Merge "Page ranges not correct in come cases." into klp-dev

10 years agoMerge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev
Dianne Hackborn [Mon, 23 Sep 2013 16:36:29 +0000 (16:36 +0000)]
Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev

10 years agoIssue #10461551: KLP API Review: AppOpsManager
Dianne Hackborn [Sun, 22 Sep 2013 19:31:38 +0000 (12:31 -0700)]
Issue #10461551: KLP API Review: AppOpsManager

Changed public constants from integers to strings.  Internally
everything is still integers, since we want that more efficient
representation for most things.

Changed the Callback interface to OnOpChangedListener.  We also
have a private versin that again takes an int, and tricks to
make both work.

Reworked the class documentation to be appropriate to the SDK
(as much as it can be); most of the existing documentation is
moved to the private implementation.  Also added documentation
of the MODE constants.

Change-Id: I4f7e73cc99fe66beff9194e960e072e2aa9458f8

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Sep 2013 16:26:49 +0000 (09:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: If36e81ae6777299362efab7889f6f4013ee544d4
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Sep 2013 16:10:23 +0000 (09:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia5c6ae14529080f176a14f5b8b2307cc2aa39fed
Auto-generated-cl: translation import

10 years agoEnsure that activities behind keyguard are paused.
Craig Mautner [Mon, 23 Sep 2013 04:08:32 +0000 (21:08 -0700)]
Ensure that activities behind keyguard are paused.

TLDR: Having a resumed activity behind keyguard can cause the keyguard
not to be dismissed.

Swiping the home button to launch Google Now causes an ASSIST intent
to be launched. The ASSIST intent starts SearchActivity which then
launches GEL. If an activity is resumed behind the keyguard when this
happens then that activity will be paused.

Because that activity is PAUSING, ActivityStackSupervisor
startActivityLocked() doesn't call dismissKeyguard() immediately.
Instead dismissKeyguard will be called later when GEL switches from
not-visible to visible. However, if the paused activity happens to be
GEL then there is never a not-visible to visible transition and
dismissKeyguard never gets called.

This fix removes an unnecessary call to resumeTopActivitiesLocked
which was causing activities behind the lockscreen to be resumed.

This fixes bug 10732489 except immediately after boot. Pausing the
initial activity if the lockscreen is visible after boot is deferred
for another CL.

Change-Id: I323262596ae41bc5a2700bae5942f6a4fba80936

10 years agoFix Java API error where requesting another style for a provided family fails
Derek Sollenberger [Mon, 23 Sep 2013 12:32:16 +0000 (08:32 -0400)]
Fix Java API error where requesting another style for a provided family fails

Internally the API uses the same code path as SkTypeface::CreateFromName which
returns NULL if the requested style is not supported by the existing family.
However, the existing Java API expects that we return the default font in the
requested style so this CL ensures that we do.

bug: 10860066
Change-Id: Ide3a0cc24015e97fa35aef283b42e7d7d11edd9c

10 years agoMerge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev
Dianne Hackborn [Sun, 22 Sep 2013 23:48:29 +0000 (23:48 +0000)]
Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev

10 years agoDebug issue #10876433 java.lang.IllegalStateException...
Dianne Hackborn [Sun, 22 Sep 2013 23:46:00 +0000 (16:46 -0700)]
Debug issue #10876433 java.lang.IllegalStateException...

...in ActivityManagerService.updateLruProcessInternalLocked on bluetooth

Add more debug output to help track down what is going on.

Also fix a little problem where, when a service ANRs, if you ask to
wait and it still wasn't responding, the ANR dialog wouldn't be
shown again.

Change-Id: I5be2b1705a0a39ca2992624ae683945c5f38065d

10 years agoMerge "Latest UX asset drop, grid padding." into klp-dev
Jeff Sharkey [Sun, 22 Sep 2013 19:55:33 +0000 (19:55 +0000)]
Merge "Latest UX asset drop, grid padding." into klp-dev

10 years agoMerge "Create unique files, root ordering, UI bugs." into klp-dev
Jeff Sharkey [Sun, 22 Sep 2013 19:55:19 +0000 (19:55 +0000)]
Merge "Create unique files, root ordering, UI bugs." into klp-dev

10 years agoMerge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev
Igor Murashkin [Sun, 22 Sep 2013 16:54:11 +0000 (16:54 +0000)]
Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev

10 years agoMerge "Fix BatchScan request coalesing" into klp-dev
Robert Greenwalt [Sun, 22 Sep 2013 15:59:00 +0000 (15:59 +0000)]
Merge "Fix BatchScan request coalesing" into klp-dev

10 years agocamera2: Rename CameraProperties to CameraCharacteristics
Igor Murashkin [Tue, 10 Sep 2013 19:15:54 +0000 (12:15 -0700)]
camera2: Rename CameraProperties to CameraCharacteristics

Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641

10 years agoMerge "camera2: Add capture sequences and capture failures" into klp-dev
Igor Murashkin [Sun, 22 Sep 2013 02:44:06 +0000 (02:44 +0000)]
Merge "camera2: Add capture sequences and capture failures" into klp-dev

10 years agoLatest UX asset drop, grid padding.
Jeff Sharkey [Sat, 21 Sep 2013 22:11:19 +0000 (15:11 -0700)]
Latest UX asset drop, grid padding.

Bring in latest asset drop.  Apply grid padding programmatically
instead of waiting for asset.  Remove alpha from directory animation.

Update save footer background to match spec.

Bug: 10700025
Change-Id: I8eef08f36d04767b78e91b23f72bdbebfbb02f58

10 years agoCreate unique files, root ordering, UI bugs.
Jeff Sharkey [Sat, 21 Sep 2013 20:57:33 +0000 (13:57 -0700)]
Create unique files, root ordering, UI bugs.

When a file already exists on disk, try adding a counter suffix to
make a unique name.  Move services near top of roots list, just below
recents.  Remove "Documents" root.

Increase number of recents allowed from single provider, and add more
logging to diagnose wedged loaders.

When launching GET_CONTENT apps, wait for successful result before
relaying result; canceled requests now return to DocumentsUI.

Add CloseGuard to ContentProviderClients, since leaked instances can
keep the remote process alive.

Fix UI bug around trailing breadcrumbs.  Fix bug that dropped Recents
from roots list.  Add up action to Settings activity.  Give our
activity a default icon while waiting for async roots to load.

Bug: 1081868310819461108194611081919610860199
Change-Id: I7b9e26b1cf8353dd3175458b23da2b4bda6c5831

10 years agoMerge commit '53221120' into fix-merge-conflict
Wink Saville [Sat, 21 Sep 2013 18:52:42 +0000 (11:52 -0700)]
Merge commit '53221120' into fix-merge-conflict

* commit '53221120':
  Do not always call setIsConnectedToProvisioningNetwork(false)

Conflicts:
core/java/android/net/MobileDataStateTracker.java

Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597

10 years agoam ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork...
Wink Saville [Sat, 21 Sep 2013 18:33:53 +0000 (11:33 -0700)]
am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)

* commit 'ab8cabf1d3e5d5fd1fff17816fbc4ab19e8f1a8e':
  Do not always call setIsConnectedToProvisioningNetwork(false)

10 years agoam 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
Wink Saville [Sat, 21 Sep 2013 18:30:33 +0000 (11:30 -0700)]
am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)

* commit '1e4f461839ebd3c9d3dc62232c2eac7d8cbdc467':
  Do not always call setIsConnectedToProvisioningNetwork(false)

10 years agoPage ranges not correct in come cases.
Svetoslav [Sat, 21 Sep 2013 01:57:21 +0000 (18:57 -0700)]
Page ranges not correct in come cases.

1. The algorithm that determines whether a page range contains
   another one had a bug and in some cases misbehaved.

2. When print is pressed we do a final layout and if nothing
   changes and we have the requeted pages we skip the final
   write. However, in this case we did not update the print
   job with the pages to be printed but we have to since in
   the previous write we did not ask for all selected pages,
   rather for the first one to be shown as a preview. Now if
   we have all pages and nothing changed we update the print
   job pages.

bug:10530142

Change-Id: I10fb62ae5ae07b8e54d547fd4dca555a12451bc5

10 years agoDo not always call setIsConnectedToProvisioningNetwork(false)
Wink Saville [Sat, 21 Sep 2013 16:01:19 +0000 (09:01 -0700)]
Do not always call setIsConnectedToProvisioningNetwork(false)

Previously I was calling setIsConnectedToProvisioningNetwork(false) always,
but all MDST's receive every broadcast. Thus we could over write an MDST's
mNetworkInfo.mIsConnectedToProvisioningNetwork to false, unless the MDST
that was set to true was last, i.e the code was order dependent.

If the provisioning networks value was false instead of true
when handleMobileProvisioningAction was called we wouldn't invoke
mdst.enableMobileProvisioning because network info would be null.

Thus the provisioning network would never transition to CONNECTED and
a default route wouldn't get setup and the browser couldn't access the
website.

Now setIsConnectedToProvisioningNetwork is only set to false when the
apnType matches and we won't indiscriminately change it and are not
order dependent.

Bug: 10853805
Change-Id: I68a4f9bdf5dc18d90f4cdef7a60811f57be67261

10 years agoFit and finish for navbar camera affordance
Jim Miller [Fri, 20 Sep 2013 21:21:50 +0000 (14:21 -0700)]
Fit and finish for navbar camera affordance

- disable search gadget while interacting with camera
- clean up code that deals with warping to track both warp and swap views.
- fade camera and search icon when camera touched
- slide camera view on screen when camera is touched.
- fix fling of camera page to center in view when animation finishes.
- resolve stateful bug between edge swipe and camera button.

Bug 10332383

Change-Id: I8fc38148a01927bc7c228101308c3c4214113047

10 years agoMerge "WebView: add an API method to control web contents debugging" into klp-dev
Jonathan Dixon [Sat, 21 Sep 2013 03:41:32 +0000 (03:41 +0000)]
Merge "WebView: add an API method to control web contents debugging" into klp-dev

10 years agoMerge "Update android.print.PrintAttributes documentation" into klp-dev
Svetoslav Ganov [Sat, 21 Sep 2013 02:39:58 +0000 (02:39 +0000)]
Merge "Update android.print.PrintAttributes documentation" into klp-dev

10 years agoam 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug...
David Friedman [Sat, 21 Sep 2013 02:11:45 +0000 (19:11 -0700)]
am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs

* commit '224234461cd7752a179ad631d9c8c3cdb3964898':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:

10 years agoam 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed...
David Friedman [Sat, 21 Sep 2013 02:09:17 +0000 (19:09 -0700)]
am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs

* commit '217683d95d0be42c738b2844b289f2207e36b70f':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:

10 years agoam e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into...
David Friedman [Sat, 21 Sep 2013 02:05:55 +0000 (19:05 -0700)]
am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs

* commit 'e12437284fcf94aed4ac5c2e10401b70fb1be086':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:

10 years agoMerge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs
David Friedman [Sat, 21 Sep 2013 02:02:45 +0000 (02:02 +0000)]
Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs