108331 Commits

Author SHA1 Message Date
Jeff Sharkey
b31e370a94 Merge "Use package name when caching SharedPreferences." 2013-06-18 16:17:18 +00:00
Scott Main
2887271ff3 am 8303a203: am 94ba190e: am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
* commit '8303a2036efd93eecda6da1e481e1659a40ca12e':
  some extra docs for TextDirectionHeuristic
2013-06-17 22:14:28 -07:00
Scott Main
8303a2036e am 94ba190e: am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
* commit '94ba190ebbd4fe7f8933d531cce7b4be8e04f287':
  some extra docs for TextDirectionHeuristic
2013-06-17 22:13:17 -07:00
Scott Main
94ba190ebb am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev
* commit 'de04dfb62dd43827c63c267003264966dd76c614':
  some extra docs for TextDirectionHeuristic
2013-06-17 22:12:14 -07:00
Scott Main
de04dfb62d Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev 2013-06-18 05:10:32 +00:00
Scott Main
d0b0d6a4d9 am c5ad4610: am c8b4658a: am 1a0a50e7: add collapsed list items for 4.1 TOC
* commit 'c5ad4610690f97a0dadfffa9bef29db115065a54':
  add collapsed list items for 4.1 TOC
2013-06-17 19:27:26 -07:00
Scott Main
c5ad461069 am c8b4658a: am 1a0a50e7: add collapsed list items for 4.1 TOC
* commit 'c8b4658a5491cd6af322d47c96c00d0a77425f7f':
  add collapsed list items for 4.1 TOC
2013-06-17 19:25:00 -07:00
Scott Main
c8b4658a54 am 1a0a50e7: add collapsed list items for 4.1 TOC
* commit '1a0a50e7c23fb0ec5fe818a7069b890f22632691':
  add collapsed list items for 4.1 TOC
2013-06-17 19:23:02 -07:00
Scott Main
1a0a50e7c2 add collapsed list items for 4.1 TOC
Change-Id: I241fb5415a3b893df7c8491c7a549f3d0d304e74
2013-06-17 19:19:38 -07:00
Scott Main
e442662330 some extra docs for TextDirectionHeuristic
Change-Id: I8ceac72a76a29bde0e25ed418110a6e4120654e3
2013-06-17 19:05:29 -07:00
Scott Main
f78484b0b1 am ea893536: am c4473d10: am 27a8508e: add attributes reference for splimotionevents and layoutmode
* commit 'ea8935362da192508a4ff945b47e0c7ff1239679':
  add attributes reference for splimotionevents and layoutmode
2013-06-17 18:41:29 -07:00
Scott Main
ea8935362d am c4473d10: am 27a8508e: add attributes reference for splimotionevents and layoutmode
* commit 'c4473d10ed747fb1e84efff7183023e0ecc1a493':
  add attributes reference for splimotionevents and layoutmode
2013-06-17 18:39:18 -07:00
Scott Main
c4473d10ed am 27a8508e: add attributes reference for splimotionevents and layoutmode
* commit '27a8508ee1236ded652cd452b93884a9193654fc':
  add attributes reference for splimotionevents and layoutmode
2013-06-17 18:36:09 -07:00
Craig Mautner
3b7e6b95c2 Merge "Add new API getStackBoxInfo" 2013-06-18 01:35:31 +00:00
Craig Mautner
fd1ce8d5a7 Add new API getStackBoxInfo
Change-Id: Ie2861e5e31bb3876cfe2d5c3d04ff58bb3955634
2013-06-17 18:34:28 -07:00
Dianne Hackborn
94c747db09 am 2f3f86c1: am 1d4cd879: am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '2f3f86c113f10b841b8597a05f724a996ba76641':
  Avoid unnecessary FindClass("java/lang/String").
2013-06-17 18:33:49 -07:00
Scott Main
27a8508ee1 add attributes reference for splimotionevents and layoutmode
Change-Id: Id78f2957c994fc30a0837084f22766c8cfa70fe8
2013-06-18 01:33:33 +00:00
Chiao Cheng
31b730a009 Remove un-used snippetize method from ContactsContract.
Bug: 7896653
Change-Id: I5db6f9a58ce747605f66c681036795cdd3ed5d01
2013-06-17 18:31:34 -07:00
Dianne Hackborn
2f3f86c113 am 1d4cd879: am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '1d4cd879044578cf7e2b37d45ef29abaabf7e662':
  Avoid unnecessary FindClass("java/lang/String").
2013-06-17 18:28:58 -07:00
Jeff Sharkey
8e3ddab1fc Use package name when caching SharedPreferences.
Otherwise multiple applications using the same process can end up
leaking SharedPreferences instances between the apps.

Change-Id: I2eb0e693cebea1daf87a9176eb8c5a22b9e9ec0b
2013-06-17 18:26:37 -07:00
Dianne Hackborn
1d4cd87904 am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."
* commit '11cd57caee4058dab743b91e715d7469c59a5c2f':
  Avoid unnecessary FindClass("java/lang/String").
2013-06-17 18:21:41 -07:00
Dianne Hackborn
11cd57caee Merge "Avoid unnecessary FindClass("java/lang/String")." 2013-06-18 01:14:37 +00:00
Scott Main
54a5338b7c am 8e8f5c11: am e4f975a3: am 7328de3d: am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
* commit '8e8f5c119e39584a0539253155e4014b7045d43e':
  replace 'developers strick back' with 'this week in android' playlist
2013-06-17 18:04:02 -07:00
Scott Main
8e8f5c119e am e4f975a3: am 7328de3d: am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
* commit 'e4f975a3212d5cf4ba3a94d047674aebbc5285d1':
  replace 'developers strick back' with 'this week in android' playlist
2013-06-17 18:01:32 -07:00
Scott Main
e4f975a321 am 7328de3d: am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
* commit '7328de3d02b8784b7562e1e0d2e749fdb854a095':
  replace 'developers strick back' with 'this week in android' playlist
2013-06-17 17:59:29 -07:00
Scott Main
7328de3d02 am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
* commit '23f33bdab3da7ac3eb11d483eb038024ed4e3564':
  replace 'developers strick back' with 'this week in android' playlist
2013-06-17 17:56:54 -07:00
Scott Main
23f33bdab3 am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
* commit '6b55515ed3c1e97b0dd932a482c375d0103f84cc':
  replace 'developers strick back' with 'this week in android' playlist
2013-06-17 17:54:26 -07:00
Xia Wang
96f94c81b7 am 7ea4e277: am 8fcb169f: am edc3bb66: Disable a flaky test case
* commit '7ea4e277fd7bdb7e2aa230509f57c1af39f5bf4b':
  Disable a flaky test case
2013-06-17 17:53:20 -07:00
Scott Main
6b55515ed3 am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist
* commit '41b08da8198e76118ef7167058a88cb920f9fb74':
  replace 'developers strick back' with 'this week in android' playlist
2013-06-17 17:53:06 -07:00
Xia Wang
7ea4e277fd am 8fcb169f: am edc3bb66: Disable a flaky test case
* commit '8fcb169f7989123f993adfac5894d1ad5f35ed0b':
  Disable a flaky test case
2013-06-17 17:51:57 -07:00
Xia Wang
8fcb169f79 am edc3bb66: Disable a flaky test case
* commit 'edc3bb661e9c8964d3926cbd7344793a32a2c2cd':
  Disable a flaky test case
2013-06-17 17:48:47 -07:00
Scott Main
41b08da819 replace 'developers strick back' with 'this week in android' playlist
Change-Id: I0aa94f6332da8543d7a2eba80307a36c26d7654c
2013-06-17 17:47:36 -07:00
Xia Wang
edc3bb661e Disable a flaky test case
Change-Id: I4ef780ed0c5394b67aa002baefc00e835018c4a0
2013-06-17 17:14:10 -07:00
Chris Craik
49cc5d7119 Merge "Handle all text bounds as post-translated" 2013-06-17 22:50:39 +00:00
Chris Craik
f09b746acb Handle all text bounds as post-translated
We were treating immediate mode bounds as pre translate, which is
inconsistent with using them for quickRejection.

This fixes the overdraw counter not drawing correctly (since it uses
immediate mode drawing.

Change-Id: I1c734d367a00942bd7d9b041822c0a9f284e70a8
2013-06-17 15:17:11 -07:00
Adam Powell
3e0a4633c3 Merge "Don't flip action bar main content and tabs" 2013-06-17 21:23:23 +00:00
Adam Powell
32fa567b52 Don't flip action bar main content and tabs
Nobody ever used or liked this "feature" anyway. Onward and upward!

Change-Id: Ica65c413d13ddb998992c7d8761ad5134f75e4fd
2013-06-17 14:16:02 -07:00
Chris Craik
36d38cb904 Merge "Better handle op size edge cases" 2013-06-17 21:02:56 +00:00
Chris Craik
d72b73cea4 Better handle op size edge cases
bug:9464358

Previously, empty and unknown sized ops are assumed to fully cover
their clip. This is now corrected such that empty sized ops are
pre-rejected before defer. Additionally, unknown sized ops disable
overdraw avoidance.

Change-Id: Icf2ce24f98be5ea6299e24ffcf826790373564a1
2013-06-17 13:52:06 -07:00
Elliott Hughes
f0542ee466 am 704dfbfe: am 48fa06f3: am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
* commit '704dfbfec40b4a51000e244a98e8723bb00ba321':
  Correct Date format for el_GR, sv_SE and tr_TR locales
2013-06-17 13:43:53 -07:00
Elliott Hughes
704dfbfec4 am 48fa06f3: am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
* commit '48fa06f34fe3098fd820b97d9d28c9f27f8591de':
  Correct Date format for el_GR, sv_SE and tr_TR locales
2013-06-17 13:41:24 -07:00
Romain Guy
fb5c905097 Merge "Cancel layer update when a layer is about to be destroyed Bug #9310706" 2013-06-17 20:39:45 +00:00
Elliott Hughes
48fa06f34f am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
* commit 'f6a671394ca3d269835d5f5b882b46f9539e9a96':
  Correct Date format for el_GR, sv_SE and tr_TR locales
2013-06-17 13:38:59 -07:00
Elliott Hughes
f6a671394c Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 2013-06-17 20:36:53 +00:00
howardb
5ad2451f9f Correct Date format for el_GR, sv_SE and tr_TR locales
Amend DateFormat.getDateFormat to CLDR data from icu4c
instead of locale specific resource entries which are incorrect
for several locales.

No CTS tests are added as they require changing the locale which
is not currently possible.

Bug: https://code.google.com/p/android/issues/detail?id=56385

Change-Id: Ibd11c7fd9b595e19a3e2bf508e1585aa50067e03
Signed-off-by: howardb <android@howardb.com>
2013-06-17 13:35:29 -07:00
Romain Guy
e93482f5ea Cancel layer update when a layer is about to be destroyed
Bug #9310706

Change-Id: I73eea6314c326f15a979617e3a05b525935f0d3f
2013-06-17 13:35:03 -07:00
Chris Craik
61e1ca68fa Merge "Check for layer renderer in flush" 2013-06-17 20:16:37 +00:00
Chris Craik
8c6e17c2a9 Check for layer renderer in flush
bug:9310706

In some cases flush will occur after a layer is destroyed. Avoid
trying to draw after putting the layer in the layer cache.

Change-Id: I55d66f420e7354fe552c82eb3145a7d91b4441e3
2013-06-17 13:04:45 -07:00
Christopher Tate
0a1e9611e9 Merge "Some system apps are more system than others" 2013-06-17 20:01:53 +00:00
Victoria Lease
e8cb257d0e Merge "make setHinting(HINTING_ON) kNormal_Hinting" 2013-06-17 19:56:04 +00:00