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

116430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
bf33f34c1b Merge "Show no_sim icon when no SIM card is available." into klp-dev 2013-10-08 00:10:05 +00:00
Baligh Uddin
175d8225f2 am 502e7c70: (-s ours) am c6f1c8a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '502e7c70d3241cd6aee84a24191ba31d6c2ad0c1':
  Import translations. DO NOT MERGE
 2013-10-07 17:09:11 -07:00
Baligh Uddin
22f9054429 am 6c835e2e: (-s ours) am 4a88a415: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '6c835e2ea9c078b5b091abb1bba39e339fbfde70':
  Import translations. DO NOT MERGE
 2013-10-07 17:09:08 -07:00
Amith Yamasani
632b7dc884 am 6db7f39b: am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '6db7f39ba573fd087c79da9585801c3f277ac8fc':
  Don't backup/restore ringer mode
 2013-10-07 17:09:04 -07:00
Baligh Uddin
49c1b2ace9 am ceb436ec: (-s ours) am 29cd41db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ceb436ec46546714fdc59fb40886658e49879eeb':
  Import translations. DO NOT MERGE
 2013-10-07 17:06:49 -07:00
Baligh Uddin
61438f5ff5 am 01e1ecd0: (-s ours) am 8fcb6a56: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '01e1ecd0dbb336c63890c18fa4133712460651e8':
  Import translations. DO NOT MERGE
 2013-10-07 17:06:46 -07:00
Baligh Uddin
370933a76e am fb93b65b: (-s ours) am f78c7884: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fb93b65b53299edb3d7c31d5249f8febdc25acf5':
  Import translations. DO NOT MERGE
 2013-10-07 17:06:43 -07:00
Michael Jurka
e72aa7f0a6 Fix crash in built-in wallpaper cropper 
Also, sync to latest version of WallpaperCropActivity

Bug: 10950237
 2013-10-07 17:06:23 -07:00
Baligh Uddin
ceb436ec46 am 29cd41db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '29cd41dbaea6d41c4cb7b6a7c1e231fda35cf3dc':
  Import translations. DO NOT MERGE
 2013-10-07 17:03:35 -07:00
Baligh Uddin
01e1ecd0db am 8fcb6a56: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8fcb6a56cb460a9921011b826550c0df211a3689':
  Import translations. DO NOT MERGE
 2013-10-07 17:03:32 -07:00
Baligh Uddin
fb93b65b53 am f78c7884: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f78c7884edf73024445e443bde77f68f292369cd':
  Import translations. DO NOT MERGE
 2013-10-07 17:03:29 -07:00
Baligh Uddin
502e7c70d3 am c6f1c8a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'c6f1c8a8bb871db3d3a0212fbdaee4a2b7cc09fd':
  Import translations. DO NOT MERGE
 2013-10-07 17:03:09 -07:00
Baligh Uddin
6c835e2ea9 am 4a88a415: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '4a88a415be17a2773209b968ca93956b034a0f8e':
  Import translations. DO NOT MERGE
 2013-10-07 17:03:03 -07:00
Amith Yamasani
6db7f39ba5 am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '1eae610981ea1d6f7816d333fb98519f2459a254':
  Don't backup/restore ringer mode
 2013-10-07 17:03:00 -07:00
Baligh Uddin
a45251080c Merge "Import translations. DO NOT MERGE" 2013-10-08 00:02:18 +00:00
Baligh Uddin
a5f585d088 Merge "Import translations. DO NOT MERGE" 2013-10-08 00:01:59 +00:00
Baligh Uddin
cadf00c4c6 Merge "Import translations. DO NOT MERGE" 2013-10-08 00:01:56 +00:00
Baligh Uddin
c6f1c8a8bb Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-08 00:01:54 +00:00
Baligh Uddin
29cd41dbae Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-08 00:01:45 +00:00
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