Mike Klein
f5b43bdc62
SkTScopedPtr -> SkAutoTDelete in Android
...
Change-Id: I8f0312f34e112d302b05852c31308a43967e7a3f
2013-08-29 11:15:06 -04:00
Baligh Uddin
c882eb73e6
Merge "Import translations. DO NOT MERGE"
2013-08-29 14:49:42 +00:00
Brian Carlstrom
7bf4ed20ba
am 2b8408da: resolved conflicts for merge of 7be3a138 to klp-dev-plus-aosp
...
* commit '2b8408dab1f8436bc5fce3d64c37fee1bd9f3932':
Add frameworks support for sample profiling from traceview gui.
2013-08-29 00:21:13 -07:00
Brian Carlstrom
2b8408dab1
resolved conflicts for merge of 7be3a138 to klp-dev-plus-aosp
...
Change-Id: If562a3203b4e737c685ec533f2d8773cae7f16ac
2013-08-29 00:10:56 -07:00
Baligh Uddin
1b0a22285d
Import translations. DO NOT MERGE
...
Change-Id: I47a12de30bcf92829bbfa2a84e42715bb779ceef
Auto-generated-cl: translation import
2013-08-28 23:27:16 -07:00
Jeff Hao
7be3a138d5
Add frameworks support for sample profiling from traceview gui.
...
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
Change-Id: I3553bafe24ac8deb4fa3f9a4d78939c3848b3850
2013-08-28 22:13:17 -07:00
Jeff Sharkey
98486543cc
am 6607275b: am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev
...
* commit '6607275b3a99b28f4176f8f8cc87f46c5ed051db':
Stronger DocumentsProvider contract.
2013-08-28 21:35:17 -07:00
Jeff Sharkey
6607275b3a
am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev
...
* commit '9fd81a9008d5c8dd33272b6a451d89fa2fa1841e':
Stronger DocumentsProvider contract.
2013-08-28 21:32:08 -07:00
Jeff Sharkey
9fd81a9008
Merge "Stronger DocumentsProvider contract." into klp-dev
2013-08-29 04:27:02 +00:00
Jeff Sharkey
aeb16e2435
Stronger DocumentsProvider contract.
...
Using a contract class requires that a provider implement it exactly
with little help. This change introduces a DocumentsProvider abstract
class that provides a client-side implementation of the contract that
greatly reduces developer burden, and improves correctness.
This also moves to first-class DocumentRoot objects, and moves calls
with complex side effects to be ContentProvider.call() invocations,
offering more granular permission control over Uri operations that
shouldn't be available through Uri grants.
This new design also relaxes the requirement that root information be
burned into every Uri. Migrate ExternalDocumentsProvider and
DocumentsUI to adopt new API.
Bug: 10497206
Change-Id: I6f2b3f519bfd62a9d693223ea5628a971ce2e743
2013-08-28 20:49:42 -07:00
Baligh Uddin
5e20b72b0c
am 28b8eb91: (-s ours) am 166853e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '28b8eb91bc2fda27bdde82dad3fcba01fbb4cd04':
Import translations. DO NOT MERGE
2013-08-28 20:12:02 -07:00
Baligh Uddin
8601ff79f5
am 8432461f: (-s ours) am 5c776270: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8432461f6e4b9f0236f6631b1ab83cf98eb95850':
Import translations. DO NOT MERGE
2013-08-28 20:11:59 -07:00
Baligh Uddin
5d2ddcc6de
am 141e2d34: (-s ours) am 9c359755: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '141e2d3444b07c416341b0b1c1f48c5ddbee1904':
Import translations. DO NOT MERGE
2013-08-28 20:11:56 -07:00
Baligh Uddin
28b8eb91bc
am 166853e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '166853e6c90abe84c556a574589419f576c5e986':
Import translations. DO NOT MERGE
2013-08-28 20:09:15 -07:00
Baligh Uddin
8432461f6e
am 5c776270: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '5c7762707733fc2001a7cb62a3daf51bc111d7db':
Import translations. DO NOT MERGE
2013-08-28 20:09:11 -07:00
Baligh Uddin
141e2d3444
am 9c359755: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '9c3597554686ab3a9fc73ab236c8c4ac31bc5083':
Import translations. DO NOT MERGE
2013-08-28 20:09:08 -07:00
Baligh Uddin
bdeefadd71
Merge "Import translations. DO NOT MERGE"
2013-08-29 03:06:25 +00:00
Baligh Uddin
e450d55f32
Merge "Import translations. DO NOT MERGE"
2013-08-29 03:06:15 +00:00
Baligh Uddin
166853e6c9
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-29 03:06:07 +00:00
Baligh Uddin
2825bce193
Merge "Import translations. DO NOT MERGE"
2013-08-29 03:05:41 +00:00
Baligh Uddin
6bf888ddc2
Merge "Import translations. DO NOT MERGE"
2013-08-29 03:05:00 +00:00
Baligh Uddin
cf9ceef72f
Merge "Import translations. DO NOT MERGE"
2013-08-29 03:04:36 +00:00
Baligh Uddin
42ca28e97a
Merge "Import translations. DO NOT MERGE"
2013-08-29 03:04:21 +00:00
Baligh Uddin
5c77627077
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-29 03:04:13 +00:00
Baligh Uddin
716c619911
Merge "Import translations. DO NOT MERGE"
2013-08-29 03:04:04 +00:00
Baligh Uddin
9c35975546
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-29 03:04:01 +00:00
Baligh Uddin
911854db33
Merge "Import translations. DO NOT MERGE"
2013-08-29 03:03:48 +00:00
Baligh Uddin
b7b43f89ca
Import translations. DO NOT MERGE
...
Change-Id: I2d9b9480f24eed9e6ec962222d212bbfb1179cde
Auto-generated-cl: translation import
2013-08-28 18:40:09 -07:00
Baligh Uddin
d691402f86
Import translations. DO NOT MERGE
...
Change-Id: I9e30ea7a2bb8951c38cd86979b939f75d19d85d4
Auto-generated-cl: translation import
2013-08-28 18:38:29 -07:00
Baligh Uddin
612db0a007
Import translations. DO NOT MERGE
...
Change-Id: I665172800a06d780b92a5db2ab549980c87e8524
Auto-generated-cl: translation import
2013-08-28 18:35:58 -07:00
Baligh Uddin
b5445c815e
Import translations. DO NOT MERGE
...
Change-Id: I2ae3c5acea8bc6736dc896c9a51647894a5f3175
Auto-generated-cl: translation import
2013-08-28 18:34:39 -07:00
Baligh Uddin
27b7534f8e
Import translations. DO NOT MERGE
...
Change-Id: I6b9b8488aabcd5c903c1fa32b66b04d9b29101ac
Auto-generated-cl: translation import
2013-08-28 18:32:51 -07:00
Alan Viverette
9896fce07b
am de16f5f6: am b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
...
* commit 'de16f5f6056aecdc37c9b475157545862dbf3166':
Fix documentation regarding defStyle in View constructor
2013-08-28 18:23:12 -07:00
Alan Viverette
de16f5f605
am b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
...
* commit 'b432ca60c6c7af42989db28594137f6fe1e888b4':
Fix documentation regarding defStyle in View constructor
2013-08-28 18:17:31 -07:00
Alan Viverette
b432ca60c6
Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
2013-08-29 01:15:48 +00:00
Baligh Uddin
1aa207398e
Import translations. DO NOT MERGE
...
Change-Id: I6c791fa210df4aea49e2b0ffaaf852ae6fc90cb1
Auto-generated-cl: translation import
2013-08-28 18:09:00 -07:00
John Spurlock
44046e6c69
am 0d669d6d: am ab8fe692: Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
...
* commit '0d669d6d6710dd25f9e725f43de957c21a974625':
Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
2013-08-28 18:07:39 -07:00
Baligh Uddin
e04db0e6c7
Import translations. DO NOT MERGE
...
Change-Id: I3cd8e76785b3e1da0e3470f16d7a41d2245ce868
Auto-generated-cl: translation import
2013-08-28 18:07:09 -07:00
Baligh Uddin
62ee6fab65
Import translations. DO NOT MERGE
...
Change-Id: Ic6b1048f4afaa520fea602ec4367de5e192186bd
Auto-generated-cl: translation import
2013-08-28 18:05:47 -07:00
John Spurlock
0d669d6d67
am ab8fe692: Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
...
* commit 'ab8fe692961bb3bf71169fd7a43aff4de837ab26':
Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
2013-08-28 18:04:25 -07:00
Baligh Uddin
aaf070f427
Import translations. DO NOT MERGE
...
Change-Id: I3667334cadafa0e615801374c02fa2ded0095637
Auto-generated-cl: translation import
2013-08-28 18:02:16 -07:00
John Spurlock
ab8fe69296
Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
2013-08-29 01:00:03 +00:00
Robert Greenwalt
fabb0e093a
am 36672fa0: am 9fe5b28d: Merge "More elaborate logs to debug missing APs" into klp-dev
...
* commit '36672fa0c94f0596ddf08ba810451956f0c7fd05':
More elaborate logs to debug missing APs
2013-08-28 17:57:30 -07:00
Robert Greenwalt
36672fa0c9
am 9fe5b28d: Merge "More elaborate logs to debug missing APs" into klp-dev
...
* commit '9fe5b28dc2a187f5974e42ac61841b46a5d91236':
More elaborate logs to debug missing APs
2013-08-28 17:54:20 -07:00
Robert Greenwalt
9fe5b28dc2
Merge "More elaborate logs to debug missing APs" into klp-dev
2013-08-29 00:51:35 +00:00
Baligh Uddin
ad155cdacc
Import translations. DO NOT MERGE
...
Change-Id: I22efa95394f7b572df2b43138fee45bd7eaf4229
Auto-generated-cl: translation import
2013-08-28 17:36:17 -07:00
Baligh Uddin
c8994d0a61
Import translations. DO NOT MERGE
...
Change-Id: I828f3e217a2a004ff6af8ca4fad760f44024205a
Auto-generated-cl: translation import
2013-08-28 17:30:22 -07:00
Sandeep Siddhartha
431e7f5c50
am 088e9046: am 720959cc: Merge "Start using the Hotword recognition APIs" into klp-dev
...
* commit '088e904680876306aa4bb2c8e80abb67dc76aeb3':
Start using the Hotword recognition APIs
2013-08-28 17:00:43 -07:00
Chet Haase
8314be5784
am 3ddc33e2: am 52485b0b: Merge "Better transition interruption and TextChange fixes" into klp-dev
...
* commit '3ddc33e26cc10705169f47b57ef9dcefda1ef2ab':
Better transition interruption and TextChange fixes
2013-08-28 17:00:40 -07:00
Alan Viverette
fb410d219f
Fix documentation regarding defStyle in View constructor
...
BUG: 8912583
Change-Id: Ib8b1f8baa4ee98aae0e66edc547ab014b2401415
2013-08-28 16:57:42 -07:00