110067 Commits

Author SHA1 Message Date
Jeff Brown
445b5f460f Merge "Minor style cleanups." 2013-08-06 19:31:23 +00:00
Jeff Sharkey
b3316ef798 Merge "Storage roots in fragment, sectioned." 2013-08-06 18:42:18 +00:00
Jean-Michel Trivi
34077aa6bb Merge "Reorder and comment MediaFocusControl code" 2013-08-06 18:40:55 +00:00
Jeff Sharkey
66516697a2 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
2013-08-06 11:38:46 -07:00
Amith Yamasani
aac3954414 Merge "Remove restrictions PIN for all users" 2013-08-06 18:20:55 +00:00
Amith Yamasani
350962ca82 Remove restrictions PIN for all users
Bug: 10200097
Change-Id: I4d95cd49a21e8f4f6b2c141d1205f81622c395b5
2013-08-06 11:18:53 -07:00
Alan Viverette
3ed2ba3e76 Merge "Avoid creating new objects when DateView updates time" 2013-08-06 18:18:06 +00:00
Jean-Michel Trivi
73673ab798 Reorder and comment MediaFocusControl code
Change-Id: Iacc03a7233789bd1588e9f7d2ca5df10a756fb0d
2013-08-06 10:42:45 -07:00
Dirk Dougherty
605ca20378 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.
2013-08-06 10:37:14 -07:00
David Christie
c5a5d20b7c Merge "Revert "Fix broken unit test"" 2013-08-06 17:28:49 +00:00
David Christie
ba530545f7 Revert "Fix broken unit test"
This reverts commit 0ca981fe42c43a4b7c345f4a0a2b3b2a519be5da.

Change-Id: I67f5e7227a8a874158c4f0954e62a77a317f1edd
2013-08-06 17:28:03 +00:00
David Christie
94fa8956b0 Merge "Fix broken unit test" 2013-08-06 16:56:16 +00:00
Zhijun He
708e359503 ImageReader: Add RGB format support.
Bug: 10155122
Change-Id: Id53d6ec815488e73bde6ca62b42c92d16bc813c9
2013-08-06 09:44:29 -07:00
Dirk Dougherty
c5663c9f7c 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.
2013-08-06 09:32:56 -07:00
Dirk Dougherty
8154d2932a 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.
2013-08-06 09:30:12 -07:00
Dirk Dougherty
58c68d7759 Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs 2013-08-06 07:35:28 +00:00
Yorke Lee
1ea19f4e49 Merge "Add DEMOTED and UNDEMOTE TO ContactsContract" 2013-08-06 03:42:06 +00:00
Jeff Brown
ef96121559 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
2013-08-05 20:39:29 -07:00
Jeff Sharkey
b87ec537fb Merge "More recents work; filtering and sorting." 2013-08-06 03:15:07 +00:00
Jeff Sharkey
ef7184a1aa 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
2013-08-05 20:14:12 -07:00
Dianne Hackborn
a8b3f7b658 Merge "Whoops, not yet time to be an error." 2013-08-06 02:12:19 +00:00
Dianne Hackborn
83524876e0 Whoops, not yet time to be an error.
Change-Id: I869026e1ad33b891010d556150f0b83fa97c4ac4
2013-08-05 19:07:41 -07:00
Elliott Hughes
26502916a8 Merge "Remove an unused C zip API." 2013-08-06 00:54:08 +00:00
Wink Saville
1280395539 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
2013-08-05 17:23:01 -07:00
Wink Saville
9fe49fc56e 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
2013-08-05 17:20:13 -07:00
Dianne Hackborn
03901667db Merge "Start restricting service calls with implicit intents." 2013-08-06 00:16:04 +00:00
Dianne Hackborn
254798f22f Merge "Add a new process state for "service restarting"." 2013-08-06 00:15:16 +00:00
Wink Saville
523db46f69 Merge "Set subscription_mode in the database to a default value" 2013-08-06 00:10:03 +00:00
Dianne Hackborn
221ea892dc 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
2013-08-05 16:53:26 -07:00
Craig Mautner
449ff24353 Merge "Clear last paused activity." 2013-08-05 23:18:07 +00:00
Craig Mautner
f140fd9cef 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
2013-08-05 16:14:22 -07:00
Xia Wang
373673abd6 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.
2013-08-05 16:03:01 -07:00
David Christie
c44510bb86 Merge "Revert icon changes in "Modify quicksettings to have new location behavior." (b/10184973)" 2013-08-05 22:59:54 +00:00
Xia Wang
3a5e2013a1 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.
2013-08-05 15:58:48 -07:00
Xia Wang
ebbcc18eaa 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.
2013-08-05 15:54:41 -07:00
Xia Wang
4032217ee9 Merge "Add option for video playback test to accept media source path." into jb-mr2-dev 2013-08-05 22:51:03 +00:00
Fabrice Di Meglio
799d6bb947 Merge "Fix bug #10185976 Black patch displaying in place of drop down spinner across apps" 2013-08-05 21:49:41 +00:00
David Christie
c90896a602 Revert icon changes in "Modify quicksettings to have new location behavior." (b/10184973)
This reverts icon changes in commit 03ed0127dae141d99b003ede9ba3ea937128e471.

Change-Id: I78e3af4a745dd4f182369edd9df9c296854e7762
2013-08-05 14:36:58 -07:00
Dianne Hackborn
8eea0fcd3b 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
2013-08-05 14:19:44 -07:00
Elliott Hughes
83ad4e393a Remove an unused C zip API.
Change-Id: I10ae849bdedf3e3bb97547c4f9e5a20742e9d6b1
2013-08-05 14:12:50 -07:00
Jeff Brown
0281b40636 Add string that was accidentally deleted.
Change-Id: I575cc0a26ab2e701a97d9fedadfb5d54d6f0d2e1
2013-08-05 14:06:50 -07:00
Yorke Lee
3585e1a611 Add DEMOTED and UNDEMOTE TO ContactsContract
Change-Id: I060e9ce7d5de3f32fc55ba619b9a931ef938bd7b
2013-08-05 13:08:55 -07:00
Baligh Uddin
117d23f0fe Merge "Import translations. DO NOT MERGE" 2013-08-05 19:55:19 +00:00
Baligh Uddin
7034771e81 Merge "Import translations. DO NOT MERGE" 2013-08-05 19:53:51 +00:00
Jean-Baptiste Queru
0e2edb49a1 Merge "Revert "Revert "be more robust with handling unknown sensors""" 2013-08-05 19:51:50 +00:00
Fabrice Di Meglio
58df6cd66e 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
2013-08-05 12:48:14 -07:00
Alan Viverette
882c246003 Fix build, updates current APIs
Change-Id: I34deb72207e6eb7c37dd57d781a66582cef62b95
2013-08-05 12:28:19 -07:00
Alan Viverette
2191a0c857 Merge "Move caption style to its own class, add presets" 2013-08-05 18:32:20 +00:00
Svetoslav Ganov
78804fc6d8 Merge "Disable print dialog spinners if there is only one option." 2013-08-05 18:28:36 +00:00
Svetoslav Ganov
55b5f8028a Disable print dialog spinners if there is only one option.
Change-Id: Ic9a46c737b592aeb6f78c962a7f9d53391a2b164
2013-08-05 11:26:16 -07:00