drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,267 Commits 1 Branch 0 Tags
Commit Graph

116267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
ab0330f226 am 713cc5bf: am fcdbc82b: am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit '713cc5bf74204e4c43429724ecc929c205c18995':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:40:07 -07:00
Dianne Hackborn
713cc5bf74 am fcdbc82b: am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit 'fcdbc82ba32b7ef1c8fbd12944b4aaed70019fb1':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:36:46 -07:00
Dianne Hackborn
fcdbc82ba3 am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit 'cade4089e75df2c9ef86aa1a37f3396e0d4b57d5':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:33:25 -07:00
Dianne Hackborn
cade4089e7 Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 2013-10-07 22:30:34 +00:00
Svetoslav Ganov
82fb4460a4 am 5ffb19ae: am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit '5ffb19aed5826bd78ca5861ffffaa814d8e4169a':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:28:19 -07:00
Svetoslav Ganov
5ffb19aed5 am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit 'f30b6474408dd27a6fd13710f352211a8a39669b':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:27:02 -07:00
Svetoslav Ganov
f30b647440 am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit 'c2d6e51d6c27eb8f3ca917b467e4a6d55d10cdc8':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:24:39 -07:00
Svetoslav Ganov
c2d6e51d6c Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 2013-10-07 22:21:52 +00:00
Zhijun He
f3441f8a42 am da7a00a2: am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev 
* commit 'da7a00a208de6dcfbadc1651b50875592616fca3':
  Camera2: fix Face class java doc build break
 2013-10-07 15:16:17 -07:00
Jeff Sharkey
5b6372171c am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:16:14 -07:00
Jeff Sharkey
f1bab3c816 am f76843d5: am 73c3c65b: am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev 
* commit 'f76843d52095315846d8a33a982bd7994cec9d8e':
  When launched into empty recents, show drawer.
 2013-10-07 15:16:11 -07:00
Eino-Ville Talvala
02e8bbf918 am fa117b44: am 474c79e8: am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev 
* commit 'fa117b44bf43868bc97b2d3795f1e033f4899351':
  Camera2: Fire all callbacks
 2013-10-07 15:16:07 -07:00
Mike Klein
bd03b9f17f am 3dd81450: am aa24442e: am d0f379c1: Preserve fill type in Path.reset(). 
* commit '3dd81450be76ef4b1d8737ec4bce34e7415a60e3':
  Preserve fill type in Path.reset().
 2013-10-07 15:16:03 -07:00
Zhijun He
da7a00a208 am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev 
* commit 'e32e311a1159d03cda7791880bb5a32ca1d5e37f':
  Camera2: fix Face class java doc build break
 2013-10-07 15:12:19 -07:00
Jeff Sharkey
9d1383c61c am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '5e02e0a9e1e075e3d451d929b0a67bf280c432ed':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:12:16 -07:00
Jeff Sharkey
f76843d520 am 73c3c65b: am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev 
* commit '73c3c65b1bb05754c688a76a1dbc79c0120c0915':
  When launched into empty recents, show drawer.
 2013-10-07 15:12:12 -07:00
Eino-Ville Talvala
fa117b44bf am 474c79e8: am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev 
* commit '474c79e80afd18c91f3fc657dfacfc5a168e2ff2':
  Camera2: Fire all callbacks
 2013-10-07 15:12:05 -07:00
Mike Klein
3dd81450be am aa24442e: am d0f379c1: Preserve fill type in Path.reset(). 
* commit 'aa24442ecfff46b13440a3de4567089c2e88c77d':
  Preserve fill type in Path.reset().
 2013-10-07 15:12:00 -07:00
Zhijun He
e32e311a11 am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev 
* commit 'c37a5ab54e5e3ad3bb816d7c9e2b923af6f74f73':
  Camera2: fix Face class java doc build break
 2013-10-07 14:58:04 -07:00
Zhijun He
c37a5ab54e Merge "Camera2: fix Face class java doc build break" into klp-dev 2013-10-07 21:53:28 +00:00
Jeff Sharkey
5e02e0a9e1 am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit 'bcc77b502b56d4b91610adfa10c657003c9c820d':
  Add <intent-filter> support to <provider>.
 2013-10-07 14:44:52 -07:00
Jeff Sharkey
bcc77b502b Merge "Add <intent-filter> support to <provider>." into klp-dev 2013-10-07 21:41:45 +00:00
Jeff Sharkey
73c3c65b1b am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev 
* commit '567fdd9fbaae4a3f6f8dc123769771881a50ed70':
  When launched into empty recents, show drawer.
 2013-10-07 14:41:17 -07:00
Dianne Hackborn
13c590de1e Fix issue #11113111: dumpsys activity service is broken 
Change-Id: Ie02d27b377c562085ef7eb5dea144ce2f382c11d
 2013-10-07 14:36:47 -07:00
Jeff Sharkey
567fdd9fba Merge "When launched into empty recents, show drawer." into klp-dev 2013-10-07 21:36:25 +00:00
Zhijun He
04eceec132 Camera2: fix Face class java doc build break 
Bug: 10406212
Change-Id: Ida4da1ee3f67e176e04d07f569e153d671fa9e40
 2013-10-07 14:35:57 -07:00
Jeff Sharkey
85f5f81320 Add <intent-filter> support to <provider>. 
For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract.  Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.

Define a well-known action for DocumentsProviders, and start using it
when querying for roots.  Continue supporting the old <meta-data>
approach until all apps have been updated.

Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
 2013-10-07 14:19:13 -07:00
Eino-Ville Talvala
474c79e80a am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev 
* commit 'ad45fa64382fa00778ff8ddfd1ac65d81fd55404':
  Camera2: Fire all callbacks
 2013-10-07 14:13:22 -07:00
Eino-Ville Talvala
ad45fa6438 Merge "Camera2: Fire all callbacks" into klp-dev 2013-10-07 21:10:41 +00:00
Mike Klein
aa24442ecf am d0f379c1: Preserve fill type in Path.reset(). 
* commit 'd0f379c1976c600313f1f4c39f2587a649e3a4fc':
  Preserve fill type in Path.reset().
 2013-10-07 14:09:54 -07:00
Jeff Sharkey
a82c2e24bc When launched into empty recents, show drawer. 
Pull out drawer to give users more context about meaningful places
to navigate to.  Also fix bug where restored roots weren't being
highlighted.

Bug: 10852518
Change-Id: Id294f6923477ca4dc505c4b0a21a5bdf8b722cf4
 2013-10-07 14:08:20 -07:00
Mike Klein
d0f379c197 Preserve fill type in Path.reset(). 
Bug: 10838355
Change-Id: I7bdecb945fc35dfed02d37745678ae7bda906628
 2013-10-07 21:04:47 +00:00
Rachad Alao
fe2ed8859a am 5be2d2af: am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev 
* commit '5be2d2af80716c08b8626046df8977dbf925df85':
  Camera2: add metadata override
 2013-10-07 13:47:54 -07:00
Rachad Alao
5be2d2af80 am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev 
* commit '0ed8c93cffec6b4d0c1e86599365074b1b2c3f1f':
  Camera2: add metadata override
 2013-10-07 13:46:05 -07:00
Rachad Alao
0ed8c93cff am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev 
* commit '00fb27dda8c74229ea55b524063410842ba4a21e':
  Camera2: add metadata override
 2013-10-07 13:42:52 -07:00
Rachad Alao
00fb27dda8 Merge "Camera2: add metadata override" into klp-dev 2013-10-07 20:40:22 +00:00
Jeff Sharkey
d6269b1575 am ab5cbb7b: am 0e438c2a: am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev 
* commit 'ab5cbb7bb58b17936193d6411a9f8c3e6015d9f9':
  Ellipsize titles in middle, otherwise end.
 2013-10-07 13:24:19 -07:00
Jeff Sharkey
ab5cbb7bb5 am 0e438c2a: am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev 
* commit '0e438c2a1b4e2de34702ce8332b3853db703dbdb':
  Ellipsize titles in middle, otherwise end.
 2013-10-07 13:21:21 -07:00
Jeff Sharkey
0e438c2a1b am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev 
* commit 'a27366efc4cac889ef454b13fa74bb4c4473b2f1':
  Ellipsize titles in middle, otherwise end.
 2013-10-07 13:19:22 -07:00
Jeff Sharkey
a27366efc4 Merge "Ellipsize titles in middle, otherwise end." into klp-dev 2013-10-07 20:17:54 +00:00
Baligh Uddin
767f507a1a am e68c0128: (-s ours) am a67fc7b7: (-s ours) am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e68c01289eebc5a24b4f5652db19a1a6a3e1a066':
  Import translations. DO NOT MERGE
 2013-10-07 12:52:41 -07:00
Baligh Uddin
eb7fa5830a am 087f350e: (-s ours) am bc8b193b: (-s ours) am e7f1a0db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '087f350ef8eb6bc1f4c00717798dcb27aea0b8df':
  Import translations. DO NOT MERGE
 2013-10-07 12:52:39 -07:00
Baligh Uddin
1f8a34052f am 1ec95bc5: (-s ours) am 05f3b6ac: (-s ours) am 79bcca23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1ec95bc5eba69a8e01293d0c8fd98682615c79c4':
  Import translations. DO NOT MERGE
 2013-10-07 12:52:36 -07:00
Baligh Uddin
3af040b009 am 2c5ead86: (-s ours) am 4d1fac94: (-s ours) am 8cc94767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2c5ead86f6a45c6cb9295a6c189ea4e924953a80':
  Import translations. DO NOT MERGE
 2013-10-07 12:52:33 -07:00
Baligh Uddin
e68c01289e am a67fc7b7: (-s ours) am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a67fc7b7429124909e9dee83062a38e98be2d913':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:59 -07:00
Baligh Uddin
087f350ef8 am bc8b193b: (-s ours) am e7f1a0db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bc8b193b226af08302b2adaf49a68a9f54440f64':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:56 -07:00
Baligh Uddin
1ec95bc5eb am 05f3b6ac: (-s ours) am 79bcca23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '05f3b6ac6507ea67217316e57cd11a8421b74fda':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:53 -07:00
Baligh Uddin
2c5ead86f6 am 4d1fac94: (-s ours) am 8cc94767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4d1fac943f4b8942dbe6347ee221ea23b7081288':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:51 -07:00
Baligh Uddin
e0815e2692 am c908e97a: (-s ours) am 917d56c7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'c908e97a5c89d39e12c413a7ba2a60328c3cad0b':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:04 -07:00
Baligh Uddin
9a63bb7efd am 4c9a2c20: (-s ours) am 621674dd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '4c9a2c20f8282c412ab53951fe3da201cc45fa56':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:01 -07:00