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

116410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
e2dd83a5b4 Yet more debugging for 10858941. 
Change-Id: I258957044cb1a8331124f6abbe53428429c33355
 2013-10-07 17:01:41 -07:00
Baligh Uddin
8fcb6a56cb Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-08 00:01:33 +00:00
Alex Ray
e3a8a0f573 am bb478e6d: am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 
* commit 'bb478e6da0a80da5a9dd00a005d00c40e31cfc18':
  camera2: describe non-full hw level optional tag entries
 2013-10-07 17:01:21 -07:00
Baligh Uddin
4a88a415be Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-08 00:01:19 +00:00
Adam Powell
80da140cc4 am 266b3026: am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '266b3026c42ed3ba0feedd9abe3e3bb6932c2f23':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 17:01:16 -07:00
Baligh Uddin
f78c7884ed Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-08 00:01:14 +00:00
Jim Miller
386ea6e0cd am 62d3158f: am bc015e84: am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev 
* commit '62d3158f9ea4678bf2a668508ede3d7f98823a9e':
  Disable keyguard text marquee when the display turns off.
 2013-10-07 17:01:12 -07:00
Amith Yamasani
1eae610981 am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '1b5a2e630a3f7e3787dce2cfd27738ff6232e905':
  Don't backup/restore ringer mode
 2013-10-07 16:59:55 -07:00
Amith Yamasani
1b5a2e630a Merge "Don't backup/restore ringer mode" into klp-dev 2013-10-07 23:57:36 +00:00
Adam Lesinski
e8d0f7804b resolved conflicts for merge of f2163cb0 to master 
Change-Id: Icfa7d27f67ad55da870c9ec26affe8cacd5468c4
 2013-10-07 16:53:03 -07:00
Alex Ray
bb478e6da0 am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 
* commit '783d3c1ed1989e820437fec4224079d8c860ad36':
  camera2: describe non-full hw level optional tag entries
 2013-10-07 16:31:24 -07:00
Alex Ray
783d3c1ed1 am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 
* commit '69c66f4203b1c6e76e457bfaa9e0854c5d7cd832':
  camera2: describe non-full hw level optional tag entries
 2013-10-07 16:28:58 -07:00
Adam Powell
266b3026c4 am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '20ba658bdb32cb6f02cb12d9f94419e29420f9f5':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 16:27:29 -07:00
Alex Ray
69c66f4203 Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 2013-10-07 23:25:24 +00:00
Adam Powell
20ba658bdb am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '31049d76c55b18a6d9993f0d9687598740b16014':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 16:25:17 -07:00
Adam Powell
31049d76c5 Use SCREEN Xfermode for keyguard badges; update SeekBar 
Plumb through the necessary API features through Drawables and
ImageView but leave it hidden for now pending future API review and
plumbing through the rest of the framework Drawable implementations.

Update SeekBar assets used for keyguard transport control.

Set selected status directly instead of finding views by id.

Bug 10531608
Bug 10784913

Change-Id: Ia38bd04ad1bc26e9e6da1dda8a374c9ba3ceccb3
 2013-10-07 16:14:17 -07:00
Jim Miller
62d3158f9e am bc015e84: am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev 
* commit 'bc015e847f01210298d7ccdd0239518fd8e7ee19':
  Disable keyguard text marquee when the display turns off.
 2013-10-07 16:11:54 -07:00
Jim Miller
bc015e847f am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev 
* commit 'dbc31105bda3591d64e4d3e2abb3b3eaf857222e':
  Disable keyguard text marquee when the display turns off.
 2013-10-07 16:08:54 -07:00
Jim Miller
dbc31105bd Merge "Disable keyguard text marquee when the display turns off." into klp-dev 2013-10-07 23:06:21 +00:00
Adam Lesinski
f2163cb0d1 am ea4e0751: am c884fc9f: Merge "AAPT emits error for res with no \'default\' product" into klp-dev 
* commit 'ea4e07518cd1844b1654175ef27cf9501e0dd7eb':
  AAPT emits error for res with no 'default' product
 2013-10-07 16:02:13 -07:00
Adam Lesinski
ea4e07518c am c884fc9f: Merge "AAPT emits error for res with no \'default\' product" into klp-dev 
* commit 'c884fc9f26b1707f89ae4e1e163e051996f96bb8':
  AAPT emits error for res with no 'default' product
 2013-10-07 16:00:11 -07:00
Adam Lesinski
c884fc9f26 Merge "AAPT emits error for res with no 'default' product" into klp-dev 2013-10-07 22:57:38 +00:00
Jim Miller
20daffd91e Disable keyguard text marquee when the display turns off. 
Fixes bug 11116666

Change-Id: Id9abb9d0531bcf4c5da7014ed4b9b202652b3754
 2013-10-07 15:50:43 -07:00
Igor Murashkin
3f7da6a32c am b7354bab: am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 
* commit 'b7354bab1500f7eec9360fbabf0474af0dfaad68':
  camera2: Workaround for null FACE_DETECT_MODE crashing
 2013-10-07 15:46:46 -07:00
Igor Murashkin
b7354bab15 am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 
* commit 'c80938266fcdd14f2bb749d1a9dbb4af7dbde83f':
  camera2: Workaround for null FACE_DETECT_MODE crashing
 2013-10-07 15:43:19 -07:00
Igor Murashkin
c80938266f am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 
* commit '46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d':
  camera2: Workaround for null FACE_DETECT_MODE crashing
 2013-10-07 15:41:09 -07:00
Dianne Hackborn
ab0330f226 am 713cc5bf: am fcdbc82b: am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit '713cc5bf74204e4c43429724ecc929c205c18995':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:40:07 -07:00
Igor Murashkin
46ea9b0b04 Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 2013-10-07 22:38:37 +00:00
Dianne Hackborn
713cc5bf74 am fcdbc82b: am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit 'fcdbc82ba32b7ef1c8fbd12944b4aaed70019fb1':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:36:46 -07:00
Dianne Hackborn
fcdbc82ba3 am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit 'cade4089e75df2c9ef86aa1a37f3396e0d4b57d5':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:33:25 -07:00
Baligh Uddin
c1338be070 Import translations. DO NOT MERGE 
Change-Id: I18bb504c1c6e9aed487c1c0e4741bf501d04b089
Auto-generated-cl: translation import
 2013-10-07 15:32:57 -07:00
Dianne Hackborn
cade4089e7 Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 2013-10-07 22:30:34 +00:00
Igor Murashkin
e37885a8a3 camera2: Workaround for null FACE_DETECT_MODE crashing 
Bug: 11118679
Change-Id: Id9b055744f6a2f502857b4cc0c5badb46b44a1f8
 2013-10-07 15:29:58 -07:00
Svetoslav Ganov
82fb4460a4 am 5ffb19ae: am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit '5ffb19aed5826bd78ca5861ffffaa814d8e4169a':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:28:19 -07:00
Svetoslav Ganov
5ffb19aed5 am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit 'f30b6474408dd27a6fd13710f352211a8a39669b':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:27:02 -07:00
Svetoslav Ganov
f30b647440 am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit 'c2d6e51d6c27eb8f3ca917b467e4a6d55d10cdc8':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:24:39 -07:00
Amith Yamasani
77c8831ff6 Don't backup/restore ringer mode 
Backing it up might result in restoring a new device to a silent,
or vibrate-only state, which is not a good out-of-box experience.

Bug: 11025824
Change-Id: I5b63fd3da012ffc4253338aae31527302a2d276a
 2013-10-07 15:23:16 -07:00
Svetoslav Ganov
c2d6e51d6c Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 2013-10-07 22:21:52 +00:00
Zhijun He
f3441f8a42 am da7a00a2: am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev 
* commit 'da7a00a208de6dcfbadc1651b50875592616fca3':
  Camera2: fix Face class java doc build break
 2013-10-07 15:16:17 -07:00
Jeff Sharkey
5b6372171c am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:16:14 -07:00
Jeff Sharkey
f1bab3c816 am f76843d5: am 73c3c65b: am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev 
* commit 'f76843d52095315846d8a33a982bd7994cec9d8e':
  When launched into empty recents, show drawer.
 2013-10-07 15:16:11 -07:00
Eino-Ville Talvala
02e8bbf918 am fa117b44: am 474c79e8: am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev 
* commit 'fa117b44bf43868bc97b2d3795f1e033f4899351':
  Camera2: Fire all callbacks
 2013-10-07 15:16:07 -07:00
Mike Klein
bd03b9f17f am 3dd81450: am aa24442e: am d0f379c1: Preserve fill type in Path.reset(). 
* commit '3dd81450be76ef4b1d8737ec4bce34e7415a60e3':
  Preserve fill type in Path.reset().
 2013-10-07 15:16:03 -07:00
Baligh Uddin
2689999b08 Import translations. DO NOT MERGE 
Change-Id: Iaa0ab2a0dc54f5b1b17b151ef1ba86bcf4606629
Auto-generated-cl: translation import
 2013-10-07 15:13:01 -07:00
Alan Viverette
5a0f4eccfb Ignore certain WindowManager flags when touch exploration is enabled 
Specifically, ignore any flags that alter the visibility of the navigation
bar and transparency.

BUG: 11082573
Change-Id: I17264dc55a1c6c3cb9b9cf92d5121799cecee5b8
 2013-10-07 15:12:57 -07:00
Baligh Uddin
3a44b8d577 Import translations. DO NOT MERGE 
Change-Id: Ia5acc4e7fcae5e75baffbb59d3f21761e46962e6
Auto-generated-cl: translation import
 2013-10-07 15:12:24 -07:00
Zhijun He
da7a00a208 am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev 
* commit 'e32e311a1159d03cda7791880bb5a32ca1d5e37f':
  Camera2: fix Face class java doc build break
 2013-10-07 15:12:19 -07:00
Jeff Sharkey
9d1383c61c am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '5e02e0a9e1e075e3d451d929b0a67bf280c432ed':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:12:16 -07:00
Jeff Sharkey
f76843d520 am 73c3c65b: am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev 
* commit '73c3c65b1bb05754c688a76a1dbc79c0120c0915':
  When launched into empty recents, show drawer.
 2013-10-07 15:12:12 -07:00
Eino-Ville Talvala
fa117b44bf am 474c79e8: am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev 
* commit '474c79e80afd18c91f3fc657dfacfc5a168e2ff2':
  Camera2: Fire all callbacks
 2013-10-07 15:12:05 -07:00