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

114871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
3a44b8d577 Import translations. DO NOT MERGE 
Change-Id: Ia5acc4e7fcae5e75baffbb59d3f21761e46962e6
Auto-generated-cl: translation import
 2013-10-07 15:12:24 -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
Baligh Uddin
b4e36027a2 Import translations. DO NOT MERGE 
Change-Id: I55cfb3d94218cad76233f7fffa267c0d308c5f1d
Auto-generated-cl: translation import
 2013-10-07 15:11:44 -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
Leon Scroggins III
f65183fd76 Do not attempt to decode NULL SkData. 
NewFromFD fails if mmap fails. In that case, it returns a NULL
SkData. SkMemoryStream handles NULL input by calling SkData::NewEmpty,
which is not threadsafe. If the SkMemoryStream were to get some
busted SkData, its call to read might fail. Sidestep this problem
by not creating the SkMemoryStream if the SkData is NULL, skipping
the call to SkData::NewEmpty.

BUG:11028218
Change-Id: Id70299bef1c85ffb5d17102fdb5ea071b0bee68a
 2013-10-07 17:30:47 -04:00
Baligh Uddin
2a32af3501 Import translations. DO NOT MERGE 
Change-Id: I91b75a15535cb63e77fdb7221acf714aeab8571b
Auto-generated-cl: translation import
 2013-10-07 14:27:42 -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
Baligh Uddin
8033b4e36f Import translations. DO NOT MERGE 
Change-Id: Id8dccbfb430a8b347ce909f3ad1872565968420e
Auto-generated-cl: translation import
 2013-10-07 14:02:30 -07:00
Baligh Uddin
87037fad31 Import translations. DO NOT MERGE 
Change-Id: I118f92a82d6679a2944a959d69c9cb090642ee75
Auto-generated-cl: translation import
 2013-10-07 14:00:53 -07:00
Michael Wright
2eeacc02a2 Show no_sim icon when no SIM card is available. 
Bug: 10958943
Change-Id: I1fcd961ddab45e316d726b90fdbbc176e6e7d737
 2013-10-07 13:50:32 -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
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
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
c908e97a5c am 917d56c7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '917d56c73f53ec37ed380ee08675a00c98629327':
  Import translations. DO NOT MERGE
 2013-10-07 12:46:18 -07:00
Baligh Uddin
4c9a2c20f8 am 621674dd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '621674dd6444ec852fcce3de3d1df769f9634ec8':
  Import translations. DO NOT MERGE
 2013-10-07 12:46:15 -07:00
Baligh Uddin
2095ebbeff am 43e40459: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '43e404591e5df9f7da4a0b15a5d5853821eb09c8':
  Import translations. DO NOT MERGE
 2013-10-07 12:46:13 -07:00
Baligh Uddin
a67fc7b742 am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6ac16894a9f24211ceb57de34afbf3e2d7bde7a9':
  Import translations. DO NOT MERGE
 2013-10-07 12:45:49 -07:00
Baligh Uddin
bc8b193b22 am e7f1a0db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e7f1a0db37ac1b2ffe107774f60bd956d590c2f4':
  Import translations. DO NOT MERGE
 2013-10-07 12:45:46 -07:00
Baligh Uddin
05f3b6ac65 am 79bcca23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '79bcca2311c48552a6fed8b441e65568fc889da8':
  Import translations. DO NOT MERGE
 2013-10-07 12:45:44 -07:00
Baligh Uddin
4d1fac943f am 8cc94767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8cc94767b5d2c5d6f98517fd4fa34b4f31704c63':
  Import translations. DO NOT MERGE
 2013-10-07 12:45:42 -07:00
Baligh Uddin
917d56c73f Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-07 19:44:14 +00:00
Baligh Uddin
6ac16894a9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:44:10 +00:00
Baligh Uddin
e7f1a0db37 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:44:02 +00:00
Baligh Uddin
621674dd64 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-07 19:43:54 +00:00
Baligh Uddin
79bcca2311 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:43:50 +00:00
Baligh Uddin
43e404591e Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-07 19:43:39 +00:00
Baligh Uddin
8cc94767b5 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:43:34 +00:00