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

114721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
961d2f4643 Merge "Disable camera and search from some security screens." into klp-dev 2013-10-08 00:49:23 +00:00
Jean-Michel Trivi
c38c93f4de am 1a1e24f1: Merge "Update RemoteController info when enabling/disabling it" into klp-dev 
* commit '1a1e24f18ea6bdcc7ad1335a6edf6b6740e6e39b':
  Update RemoteController info when enabling/disabling it
 2013-10-07 17:47:57 -07:00
Alan Viverette
6930d3805e Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 2013-10-08 00:47:23 +00:00
Jean-Michel Trivi
1a1e24f18e Merge "Update RemoteController info when enabling/disabling it" into klp-dev 2013-10-08 00:45:54 +00:00
Michael Jurka
e581234746 am 9aa58405: am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev 
* commit '9aa58405ccddfcaace0387c7e052c88b9cc754b7':
  Fix crash in built-in wallpaper cropper
 2013-10-07 17:25:13 -07:00
Michael Jurka
9aa58405cc am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev 
* commit '5dadf8389eed7b0bf04bcbf89d10f13d366b2d68':
  Fix crash in built-in wallpaper cropper
 2013-10-07 17:22:02 -07:00
Craig Mautner
4a38b0ab92 am 972a9855: am b729e995: Merge "Yet more debugging for 10858941." into klp-dev 
* commit '972a985590266e457d4a13400dfb5797d7b85908':
  Yet more debugging for 10858941.
 2013-10-07 17:21:41 -07:00
Craig Mautner
972a985590 am b729e995: Merge "Yet more debugging for 10858941." into klp-dev 
* commit 'b729e99578b072918eb4057226329b078173c868':
  Yet more debugging for 10858941.
 2013-10-07 17:18:33 -07:00
Michael Jurka
5dadf8389e Merge "Fix crash in built-in wallpaper cropper" into klp-dev 2013-10-08 00:18:02 +00:00
Michael Wright
d07179ba23 am 7c677bb8: am bf33f34c: Merge "Show no_sim icon when no SIM card is available." into klp-dev 
* commit '7c677bb8220023bc83ef5b78a8e298ef4d3ab463':
  Show no_sim icon when no SIM card is available.
 2013-10-07 17:16:58 -07:00
Craig Mautner
b729e99578 Merge "Yet more debugging for 10858941." into klp-dev 2013-10-08 00:16:41 +00:00
Michael Wright
7c677bb822 am bf33f34c: Merge "Show no_sim icon when no SIM card is available." into klp-dev 
* commit 'bf33f34c1b8e6483cefd3abefbe212f4583f6e6c':
  Show no_sim icon when no SIM card is available.
 2013-10-07 17:14:00 -07:00
Jim Miller
9c993bd6ba Disable camera and search from some security screens. 
This disables showing the camera and search buttons in the
navbar while SIM, PUK and Account security screens are showing.

Fixes bug 10991981

Change-Id: Ic64adc079685948f8c1114dbdefa42a671948350
 2013-10-07 17:13:45 -07:00
Svetoslav Ganov
db63677c7c Do not do a layout and write while a cancellation is in progress. 
While printing the app gets callbacks to do a layout and a write. Since
these operations can take a very long time they are implemented in a async
fashion. For example, if there is a layout request while we are still doing
a layout, we ask the application to cancel the previous layout. The problem
was that we were not waiting for the cancellation result before calling
the subsequent layout. Hence, the app ends up having to do two layouts at
the same time which breaks the printing contract. Same for write.

bug:11118426

Change-Id: If7b191c44387d88d5cec195d1785a47f986965ba
 2013-10-07 17:13:01 -07:00
Jean-Michel Trivi
19566543c4 Update RemoteController info when enabling/disabling it 
When a RemoteController listener is disabled: send its listener
 "blank" information (no artist, "stopped state"...)
When a RemoteController listener is enabled: have the current
 RemoteControlClient send the current information.

Bug 8209392

Change-Id: I375bf3c42a425ada94c61453b51669d7e819dde4
 2013-10-07 17:10:08 -07:00
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
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
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
Baligh Uddin
4a88a415be Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-08 00:01:19 +00:00
Baligh Uddin
f78c7884ed Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-08 00:01:14 +00: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
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
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
Igor Murashkin
46ea9b0b04 Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 2013-10-07 22:38:37 +00:00