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

113234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
a7dd66a470 am 9fa4b7af: Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev 
* commit '9fa4b7af7a853f31479a2b302d618cd3d832e2f2':
  Camera2Tests: create new directory for manual camera2 test apps
 2013-09-19 14:14:17 -07:00
Yuhao Zheng
2e9a426529 am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev 
* commit '2ce3362385589df472aa8e221d01ca7d8118508d':
  Remove STOPSHIP in WifiWatchdogStateMachine
 2013-09-19 14:14:14 -07:00
Igor Murashkin
9fa4b7af7a Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev 2013-09-19 21:11:57 +00:00
Yuhao Zheng
2ce3362385 Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev 2013-09-19 21:11:00 +00:00
Craig Mautner
9ea8bf154c am 7908f190: Merge "Debug for b/10689184." into klp-dev 
* commit '7908f19015632bd593965b7a3ac9c685ab23d85f':
  Debug for b/10689184.
 2013-09-19 14:10:41 -07:00
Craig Mautner
7908f19015 Merge "Debug for b/10689184." into klp-dev 2013-09-19 21:08:27 +00:00
Yuhao Zheng
fffc5a4ec9 Remove STOPSHIP in WifiWatchdogStateMachine 
There used to be some STOPSHIP code in WifiWatchdogStateMachine for debug
purposes. We don't need them for the release.

Bug: 10841961
Change-Id: I501d62e9891ace52317e6c1d399b877175099a3c
 2013-09-19 14:02:58 -07:00
petergng@google.com
a13e5dd3a9 am fe4643bb: Merge "Increasing visibility of pressed feedback for default ui widget assets" into klp-dev 
* commit 'fe4643bb55afeb993714c79b132b4b40164e26ac':
  Increasing visibility of pressed feedback for default ui widget assets
 2013-09-19 14:00:30 -07:00
petergng@google.com
fe4643bb55 Merge "Increasing visibility of pressed feedback for default ui widget assets" into klp-dev 2013-09-19 20:57:03 +00:00
Craig Mautner
cd569b31d3 am e8a94224: Merge "Return tasks in correct order." into klp-dev 
* commit 'e8a9422495d6af9fc68cf4e838a4a5f19177034b':
  Return tasks in correct order.
 2013-09-19 13:05:43 -07:00
Craig Mautner
e8a9422495 Merge "Return tasks in correct order." into klp-dev 2013-09-19 20:03:24 +00:00
Craig Mautner
b3370cec71 Debug for b/10689184. 
Change-Id: I67b7a4bd7fb902b0d0275af0665625593dc1af00
 2013-09-19 12:55:19 -07:00
Christopher Tate
654aad2160 am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev 
* commit '9c5cc571e5abf97a816fea2b04cd1e711e83564c':
  Support for "not the home app you're looking for" metadata
 2013-09-19 12:48:19 -07:00
Christopher Tate
9c5cc571e5 Merge "Support for "not the home app you're looking for" metadata" into klp-dev 2013-09-19 19:46:20 +00:00
petergng@google.com
18697f4be7 Increasing visibility of pressed feedback for default ui widget assets 
Change-Id: Ibfab7a6428b9a971a8624d3b8daeb40a503f7a1f
 2013-09-19 12:36:51 -07:00
Christopher Tate
bd413f6c05 Support for "not the home app you're looking for" metadata 
* Make sure that pm.getHomeActivities() returns the activity metadata
  as well, so that the caller can trace the reference

* Add a public canonical name for that metadata key

Bug 10749961

Change-Id: Ic4d0750d61001ffe5af180398f042afa30eea1ce
 2013-09-19 12:31:49 -07:00
John Spurlock
cc8dc0139e am 0286f5e2: Merge "Bar gradients now 55% to 0% black." into klp-dev 
* commit '0286f5e2786865e35781180c88e67a0f981e942d':
  Bar gradients now 55% to 0% black.
 2013-09-19 12:29:00 -07:00
John Spurlock
0286f5e278 Merge "Bar gradients now 55% to 0% black." into klp-dev 2013-09-19 19:26:25 +00:00
John Spurlock
0558a6f0a6 Bar gradients now 55% to 0% black. 
Bug:10840205
Change-Id: If30e13ab4f61cd65b7fdf7e5e987191fec1f45f2
 2013-09-19 15:22:17 -04:00
Amith Yamasani
80af4f7b09 am 7301bd96: Merge "Use a separate thread for services that do NTP lookup" into klp-dev 
* commit '7301bd96c43f1a3604e88612c1a4214d57f88000':
  Use a separate thread for services that do NTP lookup
 2013-09-19 12:21:12 -07:00
Amith Yamasani
7301bd96c4 Merge "Use a separate thread for services that do NTP lookup" into klp-dev 2013-09-19 19:17:51 +00:00
Jeff Sharkey
ba8129f1b1 am 18b94817: Merge "Also catch one more tablet layout NPE." into klp-dev 
* commit '18b94817a452081f6756cd30be9414c496fa1ca7':
  Also catch one more tablet layout NPE.
 2013-09-19 11:30:47 -07:00
Jeff Sharkey
18b94817a4 Merge "Also catch one more tablet layout NPE." into klp-dev 2013-09-19 18:27:51 +00:00
Jeff Sharkey
f8abf2e387 Also catch one more tablet layout NPE. 
Bug: 10837208
Change-Id: I178110431221773658403319b2be7aff22adadc8
 2013-09-19 11:25:56 -07:00
Jeff Sharkey
5de6787d1e am 7cb93f4e: Merge "Fix tablet layout and resources." into klp-dev 
* commit '7cb93f4e227d603dadd065ea4173b6779279221e':
  Fix tablet layout and resources.
 2013-09-19 11:24:09 -07:00
Jeff Sharkey
7cb93f4e22 Merge "Fix tablet layout and resources." into klp-dev 2013-09-19 18:22:12 +00:00
Craig Mautner
c0fd805234 Return tasks in correct order. 
Fixed ActivityManager.getRunningTasks().

Fixes bug 10705790.

Change-Id: Ia3f66e592e08a87896a1ab59f980618ec5310dfe
 2013-09-19 11:20:17 -07:00
Jeff Sharkey
0aaeaab0bf Fix tablet layout and resources. 
Bug: 10837208
Change-Id: I563a3b66976b5b02cdb25e077bf0709bb6e66926
 2013-09-19 11:19:39 -07:00
Amith Yamasani
450a16b33f Use a separate thread for services that do NTP lookup 
Some services do periodic network time lookups and can wedge the other operations on
BackgroundThread and IO Thread, causing Watchdog to kill the runtime. So best to put
those handlers on separate threads.

Going forward, should convert NTP lookups to be async with callbacks.

Bug: 10646480
Change-Id: I8c7ba6052cb3539575712c2099a706b14ff60196
 2013-09-19 10:57:16 -07:00
Derek Sollenberger
23b7bc1b44 am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev 
* commit 'a2c6209f6120d300cd28d97ec868b5cabb3ee1a9':
  Update SkTypeface::CreateFromName to handle NULL if familyName does not match
 2013-09-19 10:57:00 -07:00
Baligh Uddin
be64336477 am 25f9f364: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '25f9f364f58a1338f16c3a3e87a8810a65e87302':
  Import translations. DO NOT MERGE
 2013-09-19 10:53:04 -07:00
Baligh Uddin
16c68d6296 am 07cf6487: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '07cf648761927913019baac374198c57b233b93e':
  Import translations. DO NOT MERGE
 2013-09-19 10:53:02 -07:00
Geoffrey Borggaard
ce040924f7 am 5b05a115: Merge "Remove char limit." into klp-dev 
* commit '5b05a1159b6a0dbd26e6d49c9f53b449e2d9b041':
  Remove char limit.
 2013-09-19 10:52:59 -07:00
Baligh Uddin
26aa6e904c am 8074862d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8074862d9b30394a9715cbc4e33ac39ed6b89072':
  Import translations. DO NOT MERGE
 2013-09-19 10:52:57 -07:00
Derek Sollenberger
a2c6209f61 Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev 2013-09-19 17:52:00 +00:00
Baligh Uddin
25f9f364f5 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-19 17:39:50 +00:00
Baligh Uddin
07cf648761 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-19 17:39:32 +00:00
Geoffrey Borggaard
5b05a1159b Merge "Remove char limit." into klp-dev 2013-09-19 17:39:22 +00:00
Baligh Uddin
8074862d9b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-19 17:39:17 +00:00
Geoffrey Borggaard
8e7586fa0b Remove char limit. 
This dialog box has plenty of room.
Bug: 10628262
Bug: 10618549
Bug: 10628357
Bug: 10618708

Change-Id: If1057fcbe1e40704958727e0a0337bdd6b8480a2
 2013-09-19 13:28:59 -04:00
Svetoslav
db7659e0d3 am 81d4014c: Hiding a method that was never meant to be public. 
* commit '81d4014c59d2c6cf23b0465e9b8c94b6bfe428e2':
  Hiding a method that was never meant to be public.
 2013-09-19 10:27:59 -07:00
Svetoslav
81d4014c59 Hiding a method that was never meant to be public. 
The hide javadoc annotation had a type, thus leaking the API.

bug:10552358

Change-Id: Iec4e203d0786efbe6afbd9b6995f11642935336c
 2013-09-19 10:09:49 -07:00
John Spurlock
d402c0f37b am f95c9aa7: Merge "Don\'t disable animations until screen state is known." into klp-dev 
* commit 'f95c9aa7e1229963a4cb92eed46eafc205b03cb3':
  Don't disable animations until screen state is known.
 2013-09-19 09:30:12 -07:00
John Spurlock
f95c9aa7e1 Merge "Don't disable animations until screen state is known." into klp-dev 2013-09-19 16:28:09 +00:00
Chris Wren
035541a1ba am f82e73c5: Merge "disable heads up feature in klp." into klp-dev 
* commit 'f82e73c572cf5781232db2aa9fae6e02e04dbaaf':
  disable heads up feature in klp.
 2013-09-19 09:23:36 -07:00
John Spurlock
8c52042264 Don't disable animations until screen state is known. 
Bug:10602521
Change-Id: I54a0c7a9dfd7d9c248854738414613d32d85476a
 2013-09-19 12:23:35 -04:00
Chris Wren
f82e73c572 Merge "disable heads up feature in klp." into klp-dev 2013-09-19 16:18:59 +00:00
John Spurlock
9a300a4aab am 219d0f32: Merge "Draw gradient behind fully transparent system bars." into klp-dev 
* commit '219d0f32ddd1ae82588f8b5eaa46f319c83b5fe3':
  Draw gradient behind fully transparent system bars.
 2013-09-19 09:07:24 -07:00
John Spurlock
219d0f32dd Merge "Draw gradient behind fully transparent system bars." into klp-dev 2013-09-19 16:04:15 +00:00
Jean-Michel Trivi
58910a746e am 1608f496: Merge "Public API for RemoteController" into klp-dev 
* commit '1608f496a34c001ac3836fb77d8aefdb114e82dc':
  Public API for RemoteController
 2013-09-19 08:52:07 -07:00