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

177027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins III
b3523d7f8f am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '41c458c81125fb6e3fc9eb5304f0d3216a0a2d74':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:33:04 +00:00
Leon Scroggins III
f828f43f97 am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:32:59 +00:00
Mark Renouf
99d4930064 am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161) 
* commit '55555a3dab1f3b99a3299b90851624e9dc10f3cc':
  Fixes rejected dismiss gestures (framework version of ag/677161)
 2015-04-24 17:31:31 +00:00
Quddus Chong
55931ca2de docs: Updated What's New for GMS v7.3 to remove Maps support for Wear. 
Change-Id: I8ebe6c77c4eac3ac660f148bf40ce9a1f710e5fb
 2015-04-24 10:26:19 -07:00
Leon Scroggins III
41c458c811 am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '67326bcba0f7287367dedba4caaf2a168a43f057':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:15:55 +00:00
Leon Scroggins III
38cf068c04 am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '16ac8ad7fac73524b5296f955884bd2aec405ded':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:15:43 +00:00
Adam Langley
6bf52c4271 frameworks/base: switch to using NativeConstants. 
NativeCrypto is a conscrypt class that contained several OpenSSL
constants. NativeConstants is the new class that contains the same
thing, but the latter is automatically generated and thus won't drift
from the C headers.

Bug: 20521989

Change-Id: I45c7b9a6844a06e3ffd09be692ebf733e1ebbbcc
 2015-04-24 10:00:45 -07:00
Mark Renouf
55555a3dab Fixes rejected dismiss gestures (framework version of ag/677161) 
Gus's original change description:

This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.

Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not.  At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.

In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.

BUG: 20542762

(Same as b/20350515 but for Activity dismissal at the system level.)

Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
 2015-04-24 11:47:27 -04:00
Neil Fuller
a921fa0fc3 am ff1e7e01: am 0e29681f: Merge "Load ICU4J data on boot" 
* commit 'ff1e7e01f16173ae0ea1bd9e6738ff7b5ce33add':
  Load ICU4J data on boot
 2015-04-24 11:01:29 +00:00
Neil Fuller
ff1e7e01f1 am 0e29681f: Merge "Load ICU4J data on boot" 
* commit '0e29681f98dad8df9f772d86a848190138245f3d':
  Load ICU4J data on boot
 2015-04-24 10:50:52 +00:00
Neil Fuller
0e29681f98 Merge "Load ICU4J data on boot" 2015-04-24 10:30:18 +00:00
Andrew Solovay
d25f1f7877 am 090df87d: am 4dde4c9e: am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '090df87d7e3ed91b4bfe659fd0a41fed86cb68a7':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 22:19:40 +00:00
Andrew Solovay
8ddc967246 am 8aff67ec: am dad05551: am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '8aff67ec367e43c089080fcb3f4e73ac7ac7aaf1':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 22:19:33 +00:00
Svet Ganov
2fd6dda03e am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'f33489c6bda49cf930cb06601625ddf792d41fe7':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 22:19:04 +00:00
Quddus Chong
5dafb34bca resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev 
Change-Id: I9ecfa4b7b225f2543bdbdad0f046e9474f1cb47f
 2015-04-23 14:30:26 -07:00
Andrew Solovay
090df87d7e am 4dde4c9e: am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '4dde4c9e723826fae1275c6537d2d5a615b3a0ae':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:53:23 +00:00
Andrew Solovay
4dde4c9e72 am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit 'e45e41d7fa6c88cf74be31a509003b8f9e7fa7b1':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:41:14 +00:00
Andrew Solovay
62eaad7200 am f9787d87: Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs 
* commit 'f9787d87e03987561f13888b912f96b2e473b674':
  cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26
 2015-04-23 20:36:42 +00:00
Andrew Solovay
e45e41d7fa am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '44fa5e71ab709c83af387958598f551583d6dbb0':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:29:42 +00:00
Andrew Solovay
f9787d87e0 Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs 2015-04-23 20:25:45 +00:00
Andrew Solovay
44fa5e71ab am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '5b3152cffcd90441ca4cacdf5596e9bb3428af08':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:18:51 +00:00
Quddus Chong
9af35e73ad am 79918589: docs: Fixed url for Wear sample on \'What\'s New for GMS v7.3\'. 
* commit '79918589e18c73d63c08b9688bfb2cf6af0aa0df':
  docs: Fixed url for Wear sample on 'What's New for GMS v7.3'.
 2015-04-23 20:11:47 +00:00
Andrew Solovay
a967cade1d cherrypick from lmp-docs Docs: Correcting how to escape quotes. 
Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26

The behavior for single and double-quotes is different--I expanded
this section to note how they differ.

bug: 19959941
Change-Id: I9be9c066c416e9403a3ac164af0b1ce35f7ab1dd
 2015-04-23 13:07:29 -07:00
Andrew Solovay
5b3152cffc Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 2015-04-23 20:06:34 +00:00
Quddus Chong
79918589e1 docs: Fixed url for Wear sample on 'What's New for GMS v7.3'. 
Change-Id: I42a9e28e40fe54aff1f1882265e4e472fa9cf9a0
 2015-04-23 12:56:05 -07:00
Rich Slogar
16c2458740 docs: providing resources link 
b/20453479

Change-Id: I62ed340a30efd1295d3e9a998a853b6cbfdbbd97
 2015-04-23 12:45:24 -07:00
Andrew Solovay
8aff67ec36 am dad05551: am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit 'dad055518f3416d2c212230343cb8f9433e395a2':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 19:09:28 +00:00
Andrew Solovay
dad055518f am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '24ccb900258443bff7d943ad0d4fe1ff1f6f0ba4':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:56:26 +00:00
Andrew Solovay
591ba605aa am 26a8090a: cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d 
* commit '26a8090a09bce05398cc52581ea4a5cf05d28d59':
  cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
 2015-04-23 18:50:04 +00:00
Andrew Solovay
24ccb90025 am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '7a866a88318f6a44f316dc18e0472f39a289fee6':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:44:24 +00:00
Andrew Solovay
26a8090a09 cherrypick from lmp-docs docs: Listening for restrictions-changed 
Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d

Per bug 19848206, it turns out that APPLICATION_RESTRICTIONS_CHANGED
is only sent to dynamically-declared listeners, *not* to listeners
declared in the manifest. Updated doc to note this. (The code snippet
already showed how to dynamically declare a listener.)

See first comment for doc stage location.

bug: 19848206
Change-Id: I6dc5f39dc6eed71cf2e303564ea906be3832d8a4
 2015-04-23 11:35:39 -07:00
Andrew Solovay
7a866a8831 am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:31:59 +00:00
Andrew Solovay
09cf4d500d Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 2015-04-23 18:20:07 +00:00
Joe Fernandez
1009c8de23 am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs 
* commit '92ae292e864287abcb1a78c117263f64b303b885':
  docs: Add text to JavaDocs regarding browser file access vulnerability
 2015-04-23 17:45:19 +00:00
Joe Fernandez
92ae292e86 Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs 2015-04-23 17:33:18 +00:00
Leon Scroggins III
67326bcba0 am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:41:49 +00:00
Leon Scroggins III
ea2dcda788 am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'ee35410ff8297b1ab39f3e546ebcedc27300a7de':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:29:22 +00:00
Leon Scroggins III
ee35410ff8 am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'a7501119e341626536ce12c3539c2f9a986a2945':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:20:02 +00:00
Leon Scroggins III
16ac8ad7fa am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:53:24 +00:00
Leon Scroggins III
a7501119e3 am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '69b8e962e1b8346b33a2c14889547a0ac00c8b17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:48:12 +00:00
Svet Ganov
f33489c6bd am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'd24cc19343073294b3376f825bdc0d54a8d692f1':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:43:01 +00:00
Svet Ganov
d24cc19343 am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:30:43 +00:00
Svet Ganov
db672b6cde am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:18:10 +00:00
Svet Ganov
00e91901fd Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev 2015-04-23 15:09:48 +00:00
Neil Fuller
9f7cd10134 Load ICU4J data on boot 
Bug: 20252074
Bug: 20396452
Change-Id: I17de761e0d81caa2fc280b5cc368ee6113a5d655
 2015-04-23 14:50:34 +01:00
Quddus Chong
66b087d8c1 am d6588e35: am 918b71ca: am a5cca430: am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs 
* commit 'd6588e3575eb2b2e00571c814fd418b5f061cd20':
  docs: Added What's New section for GMS v7.3 (Parmesan).
 2015-04-23 04:55:40 +00:00
Luan Nguyen
bd4120cddc am a5bc07e0: am 8cc54aa3: am 4b76e896: am 1cc56633: am 33ac358a: docs: Add Wear Capability training 
* commit 'a5bc07e0440c4409d52311be4300ba44b00351a1':
  docs: Add Wear Capability training
 2015-04-23 04:55:35 +00:00
Quddus Chong
e470fd855c am d80f4fc8: am 04002800: am d57ccb8d: am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs 
* commit 'd80f4fc80a132b40ace7ba2b51eb784d73443004':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.
 2015-04-23 04:43:41 +00:00
Quddus Chong
d6588e3575 am 918b71ca: am a5cca430: am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs 
* commit '918b71ca319373c0025c2ddf0168877c7bc8d306':
  docs: Added What's New section for GMS v7.3 (Parmesan).
 2015-04-23 04:43:35 +00:00
Luan Nguyen
a5bc07e044 am 8cc54aa3: am 4b76e896: am 1cc56633: am 33ac358a: docs: Add Wear Capability training 
* commit '8cc54aa311daf3aca1a0c793eee268bfb4d5b149':
  docs: Add Wear Capability training
 2015-04-23 04:43:29 +00:00