Commit Graph

111216 Commits

Author SHA1 Message Date
satok
da85cded35 am 9e104087: DO NOT MERGE. Fix test breakage
* commit '9e104087978553f43fcb7767ff2ee265dbd15d2c':
  DO NOT MERGE. Fix test breakage
2013-08-23 04:45:39 -07:00
satok
9e10408797 DO NOT MERGE. Fix test breakage
Change-Id: I0b2b7ce4b9f50910b4795cb480aa86a662b16f7d
2013-08-23 20:08:15 +09:00
Satoshi Kataoka
c60d6ab825 am d866f500: Merge "Add new API shouldOfferSwitchingToNextInputMethod" into klp-dev
* commit 'd866f5002aef29de5cde0e3b5e84ed3992214916':
  Add new API shouldOfferSwitchingToNextInputMethod
2013-08-23 02:33:26 -07:00
Satoshi Kataoka
d866f5002a Merge "Add new API shouldOfferSwitchingToNextInputMethod" into klp-dev 2013-08-23 09:31:51 +00:00
Jeff Brown
026ef5c4de am 5bc1ea4e: Merge "Drop touch events when no window was touched." into klp-dev
* commit '5bc1ea4e4ae0133d4d5eaa4ac98cf4719effd032':
  Drop touch events when no window was touched.
2013-08-22 20:11:54 -07:00
Jeff Brown
5bc1ea4e4a Merge "Drop touch events when no window was touched." into klp-dev 2013-08-23 03:08:41 +00:00
Jeff Brown
0b31d812ab Drop touch events when no window was touched.
Prevent spurious ANRs in the case where an input event is simply
undeliverable because there is no window at the touched location.
Previously, we would assume that we were just waiting for an
application to start and become available to handle the event but
this assumption is no longer valid.

Monkeys in particular have a tendency to inject events outside
of the boundaries of the display which results in spurious ANRs.
So we should just reject them.

Bug: 9774124
Change-Id: I5c40ce4c942f0557593a229dc5253a0e0bdb8466
2013-08-22 20:07:08 -07:00
Jeff Brown
f825d11bb8 am ec7a6330: Merge "Remove input flinger stubs. (DO NOT MERGE)" into klp-dev
* commit 'ec7a633086b3fcc7067d0e37baeda69880969e13':
  Remove input flinger stubs.  (DO NOT MERGE)
2013-08-22 19:34:07 -07:00
Jeff Brown
ec7a633086 Merge "Remove input flinger stubs. (DO NOT MERGE)" into klp-dev 2013-08-23 02:32:36 +00:00
Jeff Brown
7e458235ac Remove input flinger stubs. (DO NOT MERGE)
Bug: 10446930
Change-Id: I6c9fd490f2efd9c359c598eb2a18c4150b446564
2013-08-22 19:31:21 -07:00
Scott Main
55e30faa61 am 96b4c379: am d17619f6: am cd4e1c46: am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting.
* commit '96b4c3791ba1e92043c89f75919b2f136d33978a':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
2013-08-22 19:03:24 -07:00
Tom O'Neill
fffef62000 am ece1320b: Merge "Add a little comment about the enabled value" into klp-dev
* commit 'ece1320b86fe058ed673cb900a506d7a3c3fe267':
  Add a little comment about the enabled value
2013-08-22 19:03:22 -07:00
Scott Main
96b4c3791b am d17619f6: am cd4e1c46: am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting.
* commit 'd17619f6df6bef8a4a18e02afb0294f75cbd56de':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
2013-08-22 19:01:27 -07:00
Tom O'Neill
ece1320b86 Merge "Add a little comment about the enabled value" into klp-dev 2013-08-23 02:00:28 +00:00
Scott Main
d17619f6df am cd4e1c46: am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting.
* commit 'cd4e1c463eab530657bead6e79efa3215924f1b0':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
2013-08-22 18:58:56 -07:00
Scott Main
cd4e1c463e am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting.
* commit 'f151391b72b5ab667ea0681de5bd2fbe0d94d8a9':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
2013-08-22 18:54:35 -07:00
Scott Main
f151391b72 fix markup errors in action bar styling,
add more information about using drawables,
move 'managing the activity lifecycle' down a notch, because it's less interesting.

Change-Id: I75012207bfaa499ca881ec5cc3a94e8d66addbad
2013-08-22 18:44:44 -07:00
Michael Wright
2be53965a2 am 0ccb7d11: Merge "Fix check for default source in input command" into klp-dev
* commit '0ccb7d117fa13933cb0d7820387e00f3d1aff18d':
  Fix check for default source in input command
2013-08-22 16:39:23 -07:00
Michael Wright
0ccb7d117f Merge "Fix check for default source in input command" into klp-dev 2013-08-22 23:37:34 +00:00
Jeff Tinker
2efb6cb739 am 76cf8fe7: Merge "Add ability to test supported content types to MediaDrm" into klp-dev
* commit '76cf8fe75e7c1abce9383fb915842f62228a1d91':
  Add ability to test supported content types to MediaDrm
2013-08-22 16:13:18 -07:00
Jeff Tinker
76cf8fe75e Merge "Add ability to test supported content types to MediaDrm" into klp-dev 2013-08-22 23:08:07 +00:00
Zhijun He
a5c9881322 am f293627f: Merge "Camera2: Send warning when burst request list is empty" into klp-dev
* commit 'f293627fc2858d8a569b28e8da80047848c961dc':
  Camera2: Send warning when burst request list is empty
2013-08-22 16:03:01 -07:00
Zhijun He
f293627fc2 Merge "Camera2: Send warning when burst request list is empty" into klp-dev 2013-08-22 22:57:24 +00:00
Michael Wright
2132198d05 Fix check for default source in input command
Change-Id: I30b062e78c7d4de59a5530999e6332ba3053f7c9
2013-08-22 15:01:15 -07:00
Zhijun He
fc19e2cfe5 Camera2: Send warning when burst request list is empty
Bug: 10360518
Change-Id: I4ab89af9ecb62442ce277d0ad7604298534ff7db
2013-08-22 14:45:24 -07:00
Jose Lima
2acb95a144 am 8f91c33d: Merge "Allow replacing ResolverActivity via config value" into klp-dev
* commit '8f91c33d8d5cd393107d5fb38e4682a5486e4b50':
  Allow replacing ResolverActivity via config value
2013-08-22 14:30:51 -07:00
Jose Lima
8f91c33d8d Merge "Allow replacing ResolverActivity via config value" into klp-dev 2013-08-22 21:28:14 +00:00
Tom O'Neill
c8211ea1cc Add a little comment about the enabled value
Change-Id: I4ac0b864f55992242b6a3b0d8ffb328f23f6b645
2013-08-22 14:28:12 -07:00
Michael Wright
6d44d8fa08 am 8e3a4173: Merge "Expose API to query devices for supported keys" into klp-dev
* commit '8e3a41738fba4883f9951406f334567f621db102':
  Expose API to query devices for supported keys
2013-08-22 14:10:28 -07:00
Michael Wright
8e3a41738f Merge "Expose API to query devices for supported keys" into klp-dev 2013-08-22 21:08:02 +00:00
destradaa
e0b8cf3141 am d5deafa4: Merge "Fixes to FlpHal JNI layer." into klp-dev
* commit 'd5deafa45fcec7ac779d835132e90810225056cd':
  Fixes to FlpHal JNI layer.
2013-08-22 12:39:57 -07:00
destradaa
d5deafa45f Merge "Fixes to FlpHal JNI layer." into klp-dev 2013-08-22 19:37:37 +00:00
Jean-Michel Trivi
dde59d6ad1 am 198bc229: Merge "Ratings for RemoteControl" into klp-dev
* commit '198bc229c37fc65c7b61f1452345fb1da9c385b6':
  Ratings for RemoteControl
2013-08-22 11:38:12 -07:00
Jean-Michel Trivi
198bc229c3 Merge "Ratings for RemoteControl" into klp-dev 2013-08-22 18:33:25 +00:00
Geoffrey Borggaard
7d93aa065e am f4e8eb83: Merge "Notify the users if a user installed SSL CA Cert is present." into klp-dev
* commit 'f4e8eb8342b16f9b550243303462c823c4613c19':
  Notify the users if a user installed SSL CA Cert is present.
2013-08-22 11:16:52 -07:00
Geoffrey Borggaard
f4e8eb8342 Merge "Notify the users if a user installed SSL CA Cert is present." into klp-dev 2013-08-22 18:13:53 +00:00
Geoffrey Borggaard
348fc4867e Notify the users if a user installed SSL CA Cert is present.
Adds a tile to quick settings when a cert is present.  Message varies
depending on if this device is managed or a consumer device.
Bug: 10105918
Change-Id: Ifbe78c10638ef6e2a4661e8d18b44b8913a2cf9d
2013-08-22 18:09:57 +00:00
David Christie
3a5f3214e1 am fecd6d49: Merge "Ensure WorkSource for location blaming has names (b/10378815)" into klp-dev
* commit 'fecd6d49e07504f2dd950b701167110d1adf9d4b':
  Ensure WorkSource for location blaming has names (b/10378815)
2013-08-22 10:59:26 -07:00
David Christie
fecd6d49e0 Merge "Ensure WorkSource for location blaming has names (b/10378815)" into klp-dev 2013-08-22 17:55:26 +00:00
Baligh Uddin
68ea90281b am 96d1b01d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '96d1b01d2dbd8db34f4abdd6c06ce29cb5775dc9':
  Import translations. DO NOT MERGE
2013-08-22 10:40:17 -07:00
Baligh Uddin
96d1b01d2d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-22 17:37:03 +00:00
Dirk Dougherty
1063698a50 am e9a0601e: am 978ec174: am de525b44: am 2a4f71df: Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs
* commit 'e9a0601e6e518b7a46460045b1bcfe76492ec513':
  Temporarily disable sample code html generation in docs builds.
2013-08-22 10:16:20 -07:00
Dirk Dougherty
e9a0601e6e am 978ec174: am de525b44: am 2a4f71df: Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs
* commit '978ec174fbbbda4a844178f645e83365861a0d4c':
  Temporarily disable sample code html generation in docs builds.
2013-08-22 10:13:29 -07:00
Dirk Dougherty
978ec174fb am de525b44: am 2a4f71df: Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs
* commit 'de525b442f6a0a467074ab216543c3372786139e':
  Temporarily disable sample code html generation in docs builds.
2013-08-22 10:10:52 -07:00
David Christie
e55c9686a1 Ensure WorkSource for location blaming has names (b/10378815)
Change-Id: Ic201f7112dd9c746fe71995fcc1a533ff4a582f2
2013-08-22 10:10:34 -07:00
Dirk Dougherty
de525b442f am 2a4f71df: Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs
* commit '2a4f71df86e42f14705df452b74358e0b7970815':
  Temporarily disable sample code html generation in docs builds.
2013-08-22 10:08:08 -07:00
Dirk Dougherty
2a4f71df86 Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs 2013-08-22 17:03:41 +00:00
Jean-Michel Trivi
f823fc4dba Ratings for RemoteControl
Add support for metadata of a RemoteControlClient that can be
 updated:
 - methods to control which keys can be edited,
 - interface for an application to receive new values for a key.

Add definitions for ratings.
 A rating is:
  - a value between 0 and 100
  - or a value indicating there is no rating
 For a same piece of content, a rating can come from:
  - the user
  - "others" (i.e. not the user), to provide an average rating
 Rating styles are:
  - heart (a toggle)
  - thumb up / down
  - stars (with a configurable maximum number of stars)

Rating by user is editable metadata.

Bug 8440498

Change-Id: I1d45972f9ace4cb505ee0757e917f1d5dedd264e
2013-08-22 09:29:19 -07:00
Yorke Lee
68928ed9eb am 83e1015d: Merge "Remove dialpad_autocomplete system key from settings" into klp-dev
* commit '83e1015d73d80416d514ad40ad871a01f5181eeb':
  Remove dialpad_autocomplete system key from settings
2013-08-22 09:25:17 -07:00
Vinit Deshapnde
85b4111f9d am e2a6d3df: Merge "Introduce network link quality statistics" into klp-dev
* commit 'e2a6d3df1257c1c04b1a14777bb7ee65f634bdc3':
  Introduce network link quality statistics
2013-08-22 09:21:45 -07:00