OSDN Git Service

android-x86/frameworks-base.git
10 years agomerge in klp-release history after reset to master
The Android Automerger [Wed, 7 Aug 2013 13:00:48 +0000 (06:00 -0700)]
merge in klp-release history after reset to master

10 years agoUpdate the print job dialog and added notification assets.
Svetoslav Ganov [Wed, 7 Aug 2013 06:49:25 +0000 (23:49 -0700)]
Update the print job dialog and added notification assets.

1. Update the transition between the print job edit dialog and the
   generating print job dialog. Now the former shrinks into the
   latter.

2. Added most of the notification assets.

Change-Id: I84f35df5cb4f71b86a103c16ab87fd4d108b055b

10 years agoattempt to fix build. public api wasn't updated
Mathias Agopian [Wed, 7 Aug 2013 04:37:29 +0000 (21:37 -0700)]
attempt to fix build. public api wasn't updated

Change-Id: I5afa7f20d60c1754e4d12318219af5a5861a85e0

10 years agoMerge "Add home StackBox to all DisplayContent."
Craig Mautner [Wed, 7 Aug 2013 04:00:57 +0000 (04:00 +0000)]
Merge "Add home StackBox to all DisplayContent."

10 years agoMerge "put TextureView back to async mode"
Mathias Agopian [Wed, 7 Aug 2013 03:19:23 +0000 (03:19 +0000)]
Merge "put TextureView back to async mode"

10 years agoput TextureView back to async mode
Mathias Agopian [Wed, 7 Aug 2013 03:16:12 +0000 (20:16 -0700)]
put TextureView back to async mode

it's probably not strictly needed, but it guarantees
that the app won't deadlock itself while using a
TextureView -- this could happen if it blocked
in View.onDraw() waiting for the producer

this mimics the behavior TextureView always had.

Change-Id: I453339237a48dea91a10840b8cc0f5d2d84d1520

10 years agoMerge "Define error codes for MediaCodec.CryptoException"
Jeff Tinker [Wed, 7 Aug 2013 01:44:09 +0000 (01:44 +0000)]
Merge "Define error codes for MediaCodec.CryptoException"

10 years agoMerge "Split assets atlas batches Bug #10185769"
Romain Guy [Wed, 7 Aug 2013 01:36:24 +0000 (01:36 +0000)]
Merge "Split assets atlas batches Bug #10185769"

10 years agoSplit assets atlas batches
Romain Guy [Tue, 6 Aug 2013 20:49:28 +0000 (13:49 -0700)]
Split assets atlas batches
Bug #10185769

The assets atlas contains assets that need to be blended and assets
that do not need to be blended. With a single merge id, currently
set to be the pointer to the atlas itself, draw ops merging could
generate batches of commands containing both opaque and translucent
assets. The blend state was chosen from only one of the assets in
the batch, leading either to inefficiencies (blending large opaque
assets) or incorrect behaviors (not blending translucent assets.)

This change introduces two new merge ids in the atlas: an opaque
key and a blend key. These keys are simple booleans set to false
and true respectively (the values do not matter really.) Their
memory addresses are used as the merge ids when createing draw ops
batches, allowing all opaque ops to be batched together and all
translucent ops to be batched together.

Change-Id: I114dba0533c44987e53864b471ccb28c811f2025

10 years agoMerge "Recents in create, uniform item layouts."
Jeff Sharkey [Wed, 7 Aug 2013 01:18:02 +0000 (01:18 +0000)]
Merge "Recents in create, uniform item layouts."

10 years agoRecents in create, uniform item layouts.
Jeff Sharkey [Tue, 6 Aug 2013 23:26:14 +0000 (16:26 -0700)]
Recents in create, uniform item layouts.

Show recent directories in a separate fragment, and save as serialized
versions of new DirectoryStack. Cleaner behavior around recents and
search, instead of treating them as pseudo-Documents.

More uniform item layouts between list and grid, including both date
and size information, and originating storage root in recents. Avoid
clashing directory loaders by assigning unique numbers. Promote
list/grid switching up into activity.

Change-Id: I9a93460b896067ca036d7e772eeabde31face2e1

10 years agoAdd home StackBox to all DisplayContent.
Craig Mautner [Wed, 7 Aug 2013 01:00:25 +0000 (18:00 -0700)]
Add home StackBox to all DisplayContent.

Each display needs a stack and a stack box to contain windows.

Fixes bug 10161525.

Change-Id: Ic617cdf5a082ae68f0589e826ecbb37d8fba52ac

10 years agoAdd the inadvertently missing SCHEME string value provider
Ben Gruver [Wed, 31 Jul 2013 22:41:24 +0000 (15:41 -0700)]
Add the inadvertently missing SCHEME string value provider

Change-Id: I70ce104efac23c3776596571e48ee195be958373

10 years agoMerge "Use more styles for preferences to allow single pane 10""
Amith Yamasani [Tue, 6 Aug 2013 23:21:23 +0000 (23:21 +0000)]
Merge "Use more styles for preferences to allow single pane 10""

10 years agoMerge "NFC: @hide some APIs, add setDefaultForNextTap API."
Martijn Coenen [Tue, 6 Aug 2013 22:46:48 +0000 (22:46 +0000)]
Merge "NFC: @hide some APIs, add setDefaultForNextTap API."

10 years agoMerge "Event handler should be private in MediaFocusControl"
Jean-Michel Trivi [Tue, 6 Aug 2013 22:37:45 +0000 (22:37 +0000)]
Merge "Event handler should be private in MediaFocusControl"

10 years agoNFC: @hide some APIs, add setDefaultForNextTap API.
Martijn Coenen [Tue, 6 Aug 2013 22:34:03 +0000 (15:34 -0700)]
NFC: @hide some APIs, add setDefaultForNextTap API.

Change-Id: I31efe4c96a62e6c3dcb984a885214e6df045c6c6

10 years agoMerge "Introduce new transparent bars sysui flags."
John Spurlock [Tue, 6 Aug 2013 22:29:16 +0000 (22:29 +0000)]
Merge "Introduce new transparent bars sysui flags."

10 years agoRemove restrictions PIN for all users
Amith Yamasani [Tue, 6 Aug 2013 18:18:53 +0000 (11:18 -0700)]
Remove restrictions PIN for all users

Bug: 10200097
Change-Id: I4d95cd49a21e8f4f6b2c141d1205f81622c395b5

10 years agoUse more styles for preferences to allow single pane 10"
Amith Yamasani [Mon, 5 Aug 2013 17:26:18 +0000 (10:26 -0700)]
Use more styles for preferences to allow single pane 10"

Change-Id: Ib3b1032ca45f22bca08546eb65b2c42bc1975bdf

10 years agoPrint UI polish (a.k.a. just the next iteration))
Svetoslav Ganov [Tue, 6 Aug 2013 21:40:46 +0000 (14:40 -0700)]
Print UI polish (a.k.a. just the next iteration))

1. Added a dialog to show a spinner while the app is writing the
   printed content.

2. Fixed print job config acitivity leaking.

3. Updated the notifications a bit.

Change-Id: I8314390135a49605ee11ab4ed14b210a29566745

10 years agoMerge "Refactor ProcessStats, ProcessTracker."
Dianne Hackborn [Tue, 6 Aug 2013 21:32:41 +0000 (21:32 +0000)]
Merge "Refactor ProcessStats, ProcessTracker."

10 years agoRefactor ProcessStats, ProcessTracker.
Dianne Hackborn [Tue, 6 Aug 2013 01:18:42 +0000 (18:18 -0700)]
Refactor ProcessStats, ProcessTracker.

ProcessStats is now called ProcessCpuTracker.

ProcessTracker is now ProcessStatsService, and its inner State
class is broken out into a separate top-level ProcessStats class.
This ProcessStats is moved to the framework, so we will be able
to use it elsewhere.

Change-Id: I6a127bcb835b6b474b72647c0b99b82c2137e5c5

10 years agoClearly separate consumer and producer interfaces
Mathias Agopian [Fri, 2 Aug 2013 08:38:38 +0000 (01:38 -0700)]
Clearly separate consumer and producer interfaces

Bug: 9265647
Change-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf

10 years agoMerge "Read intent firewall rules from any xml file in the ifw directory"
Ben Gruver [Tue, 6 Aug 2013 20:02:30 +0000 (20:02 +0000)]
Merge "Read intent firewall rules from any xml file in the ifw directory"

10 years agoMerge "Extend clearing of mLastPausedActivity."
Craig Mautner [Tue, 6 Aug 2013 19:56:50 +0000 (19:56 +0000)]
Merge "Extend clearing of mLastPausedActivity."

10 years agoMerge "Minor style cleanups."
Jeff Brown [Tue, 6 Aug 2013 19:31:22 +0000 (19:31 +0000)]
Merge "Minor style cleanups."

10 years agoEvent handler should be private in MediaFocusControl
Jean-Michel Trivi [Tue, 6 Aug 2013 18:41:29 +0000 (11:41 -0700)]
Event handler should be private in MediaFocusControl

Change-Id: I034224d42a3cfed8c49bfee55b332068796f9977

10 years agoMerge "Storage roots in fragment, sectioned."
Jeff Sharkey [Tue, 6 Aug 2013 18:42:17 +0000 (18:42 +0000)]
Merge "Storage roots in fragment, sectioned."

10 years agoMerge "Reorder and comment MediaFocusControl code"
Jean-Michel Trivi [Tue, 6 Aug 2013 18:40:55 +0000 (18:40 +0000)]
Merge "Reorder and comment MediaFocusControl code"

10 years agoStorage roots in fragment, sectioned.
Jeff Sharkey [Tue, 6 Aug 2013 18:26:10 +0000 (11:26 -0700)]
Storage roots in fragment, sectioned.

Move storage roots into a fragment, since it's not a drawer on
tablets.  Cluster and sort roots when displaying.  SectionedListAdapter
to make clustered roots easier to manage.  Add docs for root types.

Move roots cache into separate class to make it easier to share.

Change-Id: Ia0b92eade059e816324641f600c08026c0e268c9

10 years agoMerge "Remove restrictions PIN for all users"
Amith Yamasani [Tue, 6 Aug 2013 18:20:55 +0000 (18:20 +0000)]
Merge "Remove restrictions PIN for all users"

10 years agoRemove restrictions PIN for all users
Amith Yamasani [Tue, 6 Aug 2013 18:18:53 +0000 (11:18 -0700)]
Remove restrictions PIN for all users

Bug: 10200097
Change-Id: I4d95cd49a21e8f4f6b2c141d1205f81622c395b5

10 years agoMerge "Avoid creating new objects when DateView updates time"
Alan Viverette [Tue, 6 Aug 2013 18:18:05 +0000 (18:18 +0000)]
Merge "Avoid creating new objects when DateView updates time"

10 years agoIntroduce new transparent bars sysui flags.
John Spurlock [Mon, 5 Aug 2013 16:22:40 +0000 (12:22 -0400)]
Introduce new transparent bars sysui flags.

Two new public sysui flags for views to request transparent
bars:
  View.SYSTEM_UI_FLAG_TRANSPARENT_STATUS
  View.SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION

This first change simply introduces the flags at the framework
level, and makes the requisite layout tweaks to WM.

As part of this change, expunge the term "hideybars" from the
codebase. The flag to declare support for transient bars is called:
  View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT

Final visuals/transitions between opaque/transparent bars will be
done as a subsequent change. Right now the transparent style is
identical to the transient bars.

Change-Id: I5ead9c5e7b77f212df5b2a5f6e770596cd2226f3

10 years agoReorder and comment MediaFocusControl code
Jean-Michel Trivi [Tue, 6 Aug 2013 17:42:45 +0000 (10:42 -0700)]
Reorder and comment MediaFocusControl code

Change-Id: Iacc03a7233789bd1588e9f7d2ca5df10a756fb0d

10 years agoam c5663c9f: am 8154d293: am 58c68d77: Merge "Doc change: Updated reference docs...
Dirk Dougherty [Tue, 6 Aug 2013 17:37:14 +0000 (10:37 -0700)]
am c5663c9f: am 8154d293: am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs

* commit 'c5663c9f7cdd33e163f745bf4e65e141ca233537':
  Doc change: Updated reference docs for Google Play Services 3.2.

10 years agoMerge "Revert "Fix broken unit test""
David Christie [Tue, 6 Aug 2013 17:28:49 +0000 (17:28 +0000)]
Merge "Revert "Fix broken unit test""

10 years agoRevert "Fix broken unit test"
David Christie [Tue, 6 Aug 2013 17:28:03 +0000 (17:28 +0000)]
Revert "Fix broken unit test"

This reverts commit 0ca981fe42c43a4b7c345f4a0a2b3b2a519be5da.

Change-Id: I67f5e7227a8a874158c4f0954e62a77a317f1edd

10 years agoMerge "Fix broken unit test"
David Christie [Tue, 6 Aug 2013 16:56:16 +0000 (16:56 +0000)]
Merge "Fix broken unit test"

10 years agoImageReader: Add RGB format support.
Zhijun He [Mon, 5 Aug 2013 21:56:11 +0000 (14:56 -0700)]
ImageReader: Add RGB format support.

Bug: 10155122
Change-Id: Id53d6ec815488e73bde6ca62b42c92d16bc813c9

10 years agoam 8154d293: am 58c68d77: Merge "Doc change: Updated reference docs for Google Play...
Dirk Dougherty [Tue, 6 Aug 2013 16:32:56 +0000 (09:32 -0700)]
am 8154d293: am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs

* commit '8154d2932a3e4f9800eeff18da640fda7a169ec8':
  Doc change: Updated reference docs for Google Play Services 3.2.

10 years agoam 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3...
Dirk Dougherty [Tue, 6 Aug 2013 16:30:12 +0000 (09:30 -0700)]
am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs

* commit '58c68d77596dc81ac6715c8bc7785d1cc430929f':
  Doc change: Updated reference docs for Google Play Services 3.2.

10 years agoExtend clearing of mLastPausedActivity.
Craig Mautner [Tue, 6 Aug 2013 15:44:42 +0000 (08:44 -0700)]
Extend clearing of mLastPausedActivity.

Add more locations where mLastPausedActivity must be set null before
calling resumeTopActivityLocked().

Also separate the "No History" activity from mLastPausedActivity by
adding mLastNoHistoryActivity. This is necessary because now
mLastPausedActivity will be null when mLastNoHistoryActivity
is checked.

Continues to fix bug 10022212.

Change-Id: Ida543b0638c865127691dc51a6e0635062539659

10 years agomerge in klp-release history after reset to master
The Android Automerger [Tue, 6 Aug 2013 15:17:33 +0000 (08:17 -0700)]
merge in klp-release history after reset to master

10 years agoMerge "Doc change: Updated reference docs for Google Play Services 3.2." into jb...
Dirk Dougherty [Tue, 6 Aug 2013 07:35:27 +0000 (07:35 +0000)]
Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs

10 years agoMerge "Add DEMOTED and UNDEMOTE TO ContactsContract"
Yorke Lee [Tue, 6 Aug 2013 03:42:06 +0000 (03:42 +0000)]
Merge "Add DEMOTED and UNDEMOTE TO ContactsContract"

10 years agoMinor style cleanups.
Jeff Brown [Tue, 6 Aug 2013 03:39:29 +0000 (20:39 -0700)]
Minor style cleanups.

A few changes to demonstrate a slightly cleaner way to write
JNI code in the framework especially when multiple types are
involved.  We use this pattern in many other places outside
of the media stack.

Added more detail to the UnsupportedOperationException that
occurs when buffer formats don't match.

Change-Id: Ic894dc1bd71b387f1be6ea1798fa59e533e9574f

10 years agoMerge "More recents work; filtering and sorting."
Jeff Sharkey [Tue, 6 Aug 2013 03:15:07 +0000 (03:15 +0000)]
Merge "More recents work; filtering and sorting."

10 years agoMore recents work; filtering and sorting.
Jeff Sharkey [Tue, 6 Aug 2013 00:56:48 +0000 (17:56 -0700)]
More recents work; filtering and sorting.

Update DirectoryFragment to render List<Document>, making it more
general purpose.  Feed it documents either from a backend Cursor or
after resolving fields from a recents Cursor.  Start in recents when
no persisted stack available.  Synthesize a root for recents.

Local directory filtering and sorting using predicates and
comparators, all performed on background thread.  Introduce
UriDerivativeLoader which handles ContentObserver updates while
producing a derivative work of a Cursor.

Split data model classes into separate files.

Change-Id: Idb88b4ee22c58c8e508328e678877f7e4c978533

10 years agoMerge "Whoops, not yet time to be an error."
Dianne Hackborn [Tue, 6 Aug 2013 02:12:19 +0000 (02:12 +0000)]
Merge "Whoops, not yet time to be an error."

10 years agoWhoops, not yet time to be an error.
Dianne Hackborn [Tue, 6 Aug 2013 02:07:41 +0000 (19:07 -0700)]
Whoops, not yet time to be an error.

Change-Id: I869026e1ad33b891010d556150f0b83fa97c4ac4

10 years agoMerge "Remove an unused C zip API."
Elliott Hughes [Tue, 6 Aug 2013 00:54:08 +0000 (00:54 +0000)]
Merge "Remove an unused C zip API."

10 years agoam 9fe49fc5: am 523db46f: Merge "Set subscription_mode in the database to a default...
Wink Saville [Tue, 6 Aug 2013 00:23:01 +0000 (17:23 -0700)]
am 9fe49fc5: am 523db46f: Merge "Set subscription_mode in the database to a default value"

* commit '9fe49fc56ef39facf7b3be5f66256bd15a87961f':
  Set subscription_mode in the database to a default value

10 years agoam 523db46f: Merge "Set subscription_mode in the database to a default value"
Wink Saville [Tue, 6 Aug 2013 00:20:13 +0000 (17:20 -0700)]
am 523db46f: Merge "Set subscription_mode in the database to a default value"

* commit '523db46f6981a40e12007dbbe629bbdc47f861ba':
  Set subscription_mode in the database to a default value

10 years agoMerge "Start restricting service calls with implicit intents."
Dianne Hackborn [Tue, 6 Aug 2013 00:16:04 +0000 (00:16 +0000)]
Merge "Start restricting service calls with implicit intents."

10 years agoMerge "Add a new process state for "service restarting"."
Dianne Hackborn [Tue, 6 Aug 2013 00:15:16 +0000 (00:15 +0000)]
Merge "Add a new process state for "service restarting"."

10 years agoClear last paused activity.
Craig Mautner [Mon, 5 Aug 2013 23:14:22 +0000 (16:14 -0700)]
Clear last paused activity.

Moving an activity to the back used to move it behind the launcher.
This meant that the test in resumeTopActivityLocked() for
mLastPausedActivity being equal to the top activity would fail after
moveTaskToBack(). In the new activity stack model the launcher is
on a different stack so if there is only one task then the test
now passes. Clearing mLastPausedActivity when moving an activity
forward now passes the test.

Fixes bug 10022212.

Change-Id: I17932d5c87d2483f13c29ae85a7067202a08f34e

10 years agoRevert icon changes in "Modify quicksettings to have new location behavior." (b/10184973)
David Christie [Mon, 5 Aug 2013 20:32:13 +0000 (13:32 -0700)]
Revert icon changes in "Modify quicksettings to have new location behavior." (b/10184973)

This reverts icon changes in commit 03ed0127dae141d99b003ede9ba3ea937128e471.

Change-Id: I78e3af4a745dd4f182369edd9df9c296854e7762

10 years agoFix bug #10185976 Black patch displaying in place of drop down spinner across apps
Fabrice Di Meglio [Mon, 5 Aug 2013 19:48:14 +0000 (12:48 -0700)]
Fix bug #10185976 Black patch displaying in place of drop down spinner across apps

This CL introduced the regression  from https://googleplex-android-review.git.corp.google.com/#/c/336753/

- use "nine-patch" instead of "bitmap" where needed
- fix also a file naming issue

Change-Id: Ib28c3622809e55fc3ed543e6ef34cc3df3421510

10 years agoDon't check for valid fragment when switching to another fragment
Amith Yamasani [Mon, 5 Aug 2013 17:55:28 +0000 (10:55 -0700)]
Don't check for valid fragment when switching to another fragment

Bug: 10184429
Change-Id: I09b39682d907a1cd7ce140e0be0faaddfaba6bd1

10 years agoMerge "Set subscription_mode in the database to a default value"
Wink Saville [Tue, 6 Aug 2013 00:10:02 +0000 (00:10 +0000)]
Merge "Set subscription_mode in the database to a default value"

10 years agoStart restricting service calls with implicit intents.
Dianne Hackborn [Sun, 4 Aug 2013 23:50:16 +0000 (16:50 -0700)]
Start restricting service calls with implicit intents.

The bindService() and startService() calls have always had
undefined behavior when used with an implicit Intent and there
are multiple matching services.  Because of this, it is not
safe for applications to use such Intents when interacting with
services, yet the platform would merrily go about doing... something.

In KLP I want to cause this case to be invalid, resulting in
an exception thrown back to the app.  Unfortunately there are
lots of (scary) things relying on this behavior, so we can't
immediately turn it into an exception, even one qualified by the
caller's target SDK version.

In this change, we start loggin a WTF when such a call happens,
and clean up some stuff in Bluetooth that was doing this behavior.

Change-Id: I62e25d07890588d2362104e20b054aebb6c0e007

10 years agoMerge "Clear last paused activity."
Craig Mautner [Mon, 5 Aug 2013 23:18:07 +0000 (23:18 +0000)]
Merge "Clear last paused activity."

10 years agoClear last paused activity.
Craig Mautner [Mon, 5 Aug 2013 23:14:22 +0000 (16:14 -0700)]
Clear last paused activity.

Moving an activity to the back used to move it behind the launcher.
This meant that the test in resumeTopActivityLocked() for
mLastPausedActivity being equal to the top activity would fail after
moveTaskToBack(). In the new activity stack model the launcher is
on a different stack so if there is only one task then the test
now passes. Clearing mLastPausedActivity when moving an activity
forward now passes the test.

Fixes bug 10022212.

Change-Id: I17932d5c87d2483f13c29ae85a7067202a08f34e

10 years agoam 3a5e2013: am ebbcc18e: am 4032217e: Merge "Add option for video playback test...
Xia Wang [Mon, 5 Aug 2013 23:03:01 +0000 (16:03 -0700)]
am 3a5e2013: am ebbcc18e: am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev

* commit '3a5e2013a1296065a4674bdc43f357d3a352a6e9':
  Add option for video playback test to accept media source path.

10 years agoMerge "Revert icon changes in "Modify quicksettings to have new location behavior...
David Christie [Mon, 5 Aug 2013 22:59:54 +0000 (22:59 +0000)]
Merge "Revert icon changes in "Modify quicksettings to have new location behavior." (b/10184973)"

10 years agoam ebbcc18e: am 4032217e: Merge "Add option for video playback test to accept media...
Xia Wang [Mon, 5 Aug 2013 22:58:48 +0000 (15:58 -0700)]
am ebbcc18e: am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev

* commit 'ebbcc18eaa8a69579fadae484630aa1ba447c031':
  Add option for video playback test to accept media source path.

10 years agoam 4032217e: Merge "Add option for video playback test to accept media source path...
Xia Wang [Mon, 5 Aug 2013 22:54:41 +0000 (15:54 -0700)]
am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev

* commit '4032217ee939d3b23548e83d9183306d66af6f8f':
  Add option for video playback test to accept media source path.

10 years agoMerge "Add option for video playback test to accept media source path." into jb-mr2-dev
Xia Wang [Mon, 5 Aug 2013 22:51:03 +0000 (22:51 +0000)]
Merge "Add option for video playback test to accept media source path." into jb-mr2-dev

10 years agoMerge "Fix bug #10185976 Black patch displaying in place of drop down spinner across...
Fabrice Di Meglio [Mon, 5 Aug 2013 21:49:41 +0000 (21:49 +0000)]
Merge "Fix bug #10185976 Black patch displaying in place of drop down spinner across apps"

10 years agoRevert icon changes in "Modify quicksettings to have new location behavior." (b/10184973)
David Christie [Mon, 5 Aug 2013 20:32:13 +0000 (13:32 -0700)]
Revert icon changes in "Modify quicksettings to have new location behavior." (b/10184973)

This reverts icon changes in commit 03ed0127dae141d99b003ede9ba3ea937128e471.

Change-Id: I78e3af4a745dd4f182369edd9df9c296854e7762

10 years agoAdd a new process state for "service restarting".
Dianne Hackborn [Fri, 2 Aug 2013 20:40:55 +0000 (13:40 -0700)]
Add a new process state for "service restarting".

This is a process that is not actually running, but would be
if we had enough RAM.

Also rework how service stats are stored to used the nice
compact structure we are already using for processes.

And fix a bug where when we committed the current state data,
we would mistakenly write it under the name of the *next* state
that is now starting.  Ouch.

Change-Id: I9f2b84b8b3f305301fd48dcd9d4e6c232abe8ef9

10 years agoRemove an unused C zip API.
Elliott Hughes [Mon, 5 Aug 2013 20:27:39 +0000 (13:27 -0700)]
Remove an unused C zip API.

Change-Id: I10ae849bdedf3e3bb97547c4f9e5a20742e9d6b1

10 years agoAdd string that was accidentally deleted.
Jeff Brown [Mon, 5 Aug 2013 21:06:50 +0000 (14:06 -0700)]
Add string that was accidentally deleted.

Change-Id: I575cc0a26ab2e701a97d9fedadfb5d54d6f0d2e1

10 years agoAdd DEMOTED and UNDEMOTE TO ContactsContract
Yorke Lee [Thu, 1 Aug 2013 01:53:31 +0000 (18:53 -0700)]
Add DEMOTED and UNDEMOTE TO ContactsContract

Change-Id: I060e9ce7d5de3f32fc55ba619b9a931ef938bd7b

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 5 Aug 2013 19:55:15 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 5 Aug 2013 19:53:51 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Revert "Revert "be more robust with handling unknown sensors"""
Jean-Baptiste Queru [Mon, 5 Aug 2013 19:51:45 +0000 (19:51 +0000)]
Merge "Revert "Revert "be more robust with handling unknown sensors"""

10 years agoFix bug #10185976 Black patch displaying in place of drop down spinner across apps
Fabrice Di Meglio [Mon, 5 Aug 2013 19:48:14 +0000 (12:48 -0700)]
Fix bug #10185976 Black patch displaying in place of drop down spinner across apps

This CL introduced the regression  from https://googleplex-android-review.git.corp.google.com/#/c/336753/

- use "nine-patch" instead of "bitmap" where needed
- fix also a file naming issue

Change-Id: Ib28c3622809e55fc3ed543e6ef34cc3df3421510

10 years agoFix build, updates current APIs
Alan Viverette [Mon, 5 Aug 2013 19:28:19 +0000 (12:28 -0700)]
Fix build, updates current APIs

Change-Id: I34deb72207e6eb7c37dd57d781a66582cef62b95

10 years agoMerge "Move caption style to its own class, add presets"
Alan Viverette [Mon, 5 Aug 2013 18:32:20 +0000 (18:32 +0000)]
Merge "Move caption style to its own class, add presets"

10 years agoMerge "Disable print dialog spinners if there is only one option."
Svetoslav Ganov [Mon, 5 Aug 2013 18:28:36 +0000 (18:28 +0000)]
Merge "Disable print dialog spinners if there is only one option."

10 years agoDisable print dialog spinners if there is only one option.
Svetoslav Ganov [Mon, 5 Aug 2013 18:26:16 +0000 (11:26 -0700)]
Disable print dialog spinners if there is only one option.

Change-Id: Ic9a46c737b592aeb6f78c962a7f9d53391a2b164

10 years agoam eab8e18d: am 8a736129: Merge "If graphics wants ASCII lowercasing, it needs to...
Elliott Hughes [Mon, 5 Aug 2013 18:10:06 +0000 (11:10 -0700)]
am eab8e18d: am 8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."

* commit 'eab8e18d8f6f34a9d35fbb120148956789ad48a2':
  If graphics wants ASCII lowercasing, it needs to ask for it.

10 years agoam 8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
Elliott Hughes [Mon, 5 Aug 2013 18:07:13 +0000 (11:07 -0700)]
am 8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."

* commit '8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
  If graphics wants ASCII lowercasing, it needs to ask for it.

10 years agoRevert "Revert "be more robust with handling unknown sensors""
Jean-Baptiste Queru [Mon, 5 Aug 2013 18:03:28 +0000 (11:03 -0700)]
Revert "Revert "be more robust with handling unknown sensors""

This reverts commit 17548b3c70fe4f29d33367a61300f5323f5efe99.

10 years agoMerge "If graphics wants ASCII lowercasing, it needs to ask for it."
Elliott Hughes [Mon, 5 Aug 2013 18:01:33 +0000 (18:01 +0000)]
Merge "If graphics wants ASCII lowercasing, it needs to ask for it."

10 years agoMerge "Replace run-time PCM encodings by compile-time constants"
Glenn Kasten [Mon, 5 Aug 2013 18:01:26 +0000 (18:01 +0000)]
Merge "Replace run-time PCM encodings by compile-time constants"

10 years agoMerge "Don't check for valid fragment when switching to another fragment"
Amith Yamasani [Mon, 5 Aug 2013 17:58:45 +0000 (17:58 +0000)]
Merge "Don't check for valid fragment when switching to another fragment"

10 years agoDon't check for valid fragment when switching to another fragment
Amith Yamasani [Mon, 5 Aug 2013 17:55:28 +0000 (10:55 -0700)]
Don't check for valid fragment when switching to another fragment

Bug: 10184429
Change-Id: I09b39682d907a1cd7ce140e0be0faaddfaba6bd1

10 years agoMerge "Explicitly compare raw pointers to NULL"
Glenn Kasten [Mon, 5 Aug 2013 17:27:29 +0000 (17:27 +0000)]
Merge "Explicitly compare raw pointers to NULL"

10 years agoMerge "Remove member "m" prefix from now local variables"
Elliott Hughes [Mon, 5 Aug 2013 17:23:20 +0000 (17:23 +0000)]
Merge "Remove member "m" prefix from now local variables"

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

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

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

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

10 years agoMerge "Remove dead code in AudioTrack JNI"
Glenn Kasten [Mon, 5 Aug 2013 16:35:59 +0000 (16:35 +0000)]
Merge "Remove dead code in AudioTrack JNI"

10 years agoMerge "Don't doubly initialize fields in constructor"
Glenn Kasten [Mon, 5 Aug 2013 16:22:07 +0000 (16:22 +0000)]
Merge "Don't doubly initialize fields in constructor"

10 years agoMerge "Clean up imports"
Glenn Kasten [Mon, 5 Aug 2013 16:18:25 +0000 (16:18 +0000)]
Merge "Clean up imports"

10 years agoMerge "Clean up throws in AudioRecord and AudioTrack"
Glenn Kasten [Mon, 5 Aug 2013 15:55:33 +0000 (15:55 +0000)]
Merge "Clean up throws in AudioRecord and AudioTrack"

10 years agoMerge "Collapse/disable shade when hiding status bar window."
John Spurlock [Mon, 5 Aug 2013 13:18:53 +0000 (13:18 +0000)]
Merge "Collapse/disable shade when hiding status bar window."