Commit Graph

164518 Commits

Author SHA1 Message Date
Leon Scroggins III
4c1f70db3d am b3523d7f: 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 'b3523d7f8f8274a04145ca34eab9821aafb52d7a':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
2015-04-24 17:43:38 +00:00
Leon Scroggins III
6db29a9245 am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit 'f828f43f97f4a018e2224e926b900713081a8c5b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
2015-04-24 17:43:23 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
Quddus Chong
d80f4fc80a am 04002800: am d57ccb8d: am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '040028000c0769606cbd5a9265f385e68c15433c':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.
2015-04-23 03:40:29 +00:00
Quddus Chong
918b71ca31 am a5cca430: am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit 'a5cca4303616e86242b4d5c5f09edbb5668e7f6b':
  docs: Added What's New section for GMS v7.3 (Parmesan).
2015-04-23 03:40:22 +00:00
Luan Nguyen
8cc54aa311 am 4b76e896: am 1cc56633: am 33ac358a: docs: Add Wear Capability training
* commit '4b76e8967cd435c2d0b01f2b9a2f11a9a4bc547e':
  docs: Add Wear Capability training
2015-04-23 03:39:53 +00:00
Quddus Chong
040028000c am d57ccb8d: am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit 'd57ccb8d3c814ea46d735d7443e02e669207afef':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.
2015-04-23 00:01:07 +00:00
Quddus Chong
a5cca43036 am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '7a8b094521832586b142de34c91ab2c886eb5109':
  docs: Added What's New section for GMS v7.3 (Parmesan).
2015-04-23 00:01:03 +00:00
Quddus Chong
d57ccb8d3c am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit 'f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.
2015-04-22 23:48:00 +00:00
Quddus Chong
7a8b094521 am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '789c59711e55be981ed2093228ded0c588e74ba0':
  docs: Added What's New section for GMS v7.3 (Parmesan).
2015-04-22 23:47:55 +00:00
Quddus Chong
f0936e2fb0 Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs 2015-04-22 23:38:38 +00:00
Quddus Chong
789c59711e Merge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docs 2015-04-22 23:37:33 +00:00
Quddus Chong
cfdcf7d6d8 docs: Added What's New section for GMS v7.3 (Parmesan).
Change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
2015-04-22 14:56:37 -07:00
Justin Koh
2aa3905cb0 Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev 2015-04-22 00:31:00 +00:00
Luan Nguyen
4b76e8967c am 1cc56633: am 33ac358a: docs: Add Wear Capability training
* commit '1cc5663357def0221b46f86e6295ea01c40be2a1':
  docs: Add Wear Capability training
2015-04-21 22:54:59 +00:00
Luan Nguyen
1cc5663357 am 33ac358a: docs: Add Wear Capability training
* commit '33ac358a5a4199549d11ba1931243e7dc8a7ab85':
  docs: Add Wear Capability training
2015-04-21 22:40:59 +00:00
ztenghui
612e5cdec6 DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
b/20119270

Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit 26e9a19900)
2015-04-21 21:26:53 +00:00
ztenghui
2360659824 DO NOT MERGE: Reset the Node status when clone.
b/20457797

Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
2015-04-21 20:31:58 +00:00
Luan Nguyen
33ac358a5a docs: Add Wear Capability training
bug: 20088602
Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
2015-04-21 08:24:49 -07:00
Luan Nguyen
2fdd83a97a am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit 'd2545775568694c75c9589eaf7c894583e37de4e':
  docs: Add Channel API summary for Wear.
2015-04-21 15:24:36 +00:00
Luan Nguyen
d254577556 am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '4c20df0bbec2774e8829245547cfe8a42c5faea7':
  docs: Add Channel API summary for Wear.
2015-04-21 15:12:51 +00:00
Luan Nguyen
4c20df0bbe am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
  docs: Add Channel API summary for Wear.
2015-04-21 15:00:56 +00:00
Luan Nguyen
4aebbfbb9b Merge "docs: Add Channel API summary for Wear." into lmp-docs 2015-04-21 14:53:04 +00:00
Quddus Chong
b1c838e03b am 6f142008: am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
* commit '6f14200880a79a9813f3448c15fe7097c3b7733b':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
2015-04-20 23:15:17 +00:00
Quddus Chong
6f14200880 am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
* commit '220f360e02ae833fcadc342756932f76f6780626':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
2015-04-20 23:03:32 +00:00
Quddus Chong
220f360e02 am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
* commit '900831f303beb4a67a871d969ac822d8b6d36460':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
2015-04-20 22:51:40 +00:00
Quddus Chong
900831f303 docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.
bug: 20304402

Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
2015-04-20 14:01:24 -07:00
Quddus Chong
33fca8eae0 docs: Added 3rd-party Javadocs for GMS Parmesan release.
Change-Id: Ia133c7267e500969310524369d34ab07c6aaa854
2015-04-20 11:21:55 -07:00
Svet Ganov
68e6b5055b DO NOT MERGE Don't take flags when creating app widget config activity.
bug:19618745

Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
2015-04-20 17:16:38 +00:00
Ryosuke Matsuuchi
3d1a37e9ec am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '38d969c5c85f930cefef6f2fcad99d5aa8a0d5f7':
  doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:44:42 +00:00