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

116886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
3ea1c9938a am 04e3a2aa: am d386c0a4: am be5ba9a2: Merge "Update search asset with new new new asset." into klp-dev 
* commit '04e3a2aaf503e15b8b549443f1351eb2a4d069da':
  Update search asset with new new new asset.
 2013-10-07 18:59:17 -07:00
Jim Miller
04e3a2aaf5 am d386c0a4: am be5ba9a2: Merge "Update search asset with new new new asset." into klp-dev 
* commit 'd386c0a4f312f4f6fc4d621a358c2850516a8292':
  Update search asset with new new new asset.
 2013-10-07 18:56:29 -07:00
Jim Miller
d386c0a4f3 am be5ba9a2: Merge "Update search asset with new new new asset." into klp-dev 
* commit 'be5ba9a255e258e03925bb651e5563625ddf6d59':
  Update search asset with new new new asset.
 2013-10-07 18:53:59 -07:00
Jim Miller
be5ba9a255 Merge "Update search asset with new new new asset." into klp-dev 2013-10-08 01:52:13 +00:00
Jim Miller
2de3b6be0b Update search asset with new new new asset. 
Fixes bug 11102853

Change-Id: Icab95409e0b641858e301157ad3f56542bb6d4f8
 2013-10-07 18:40:43 -07:00
Alan Viverette
24cafbc56c Fix HIDE_DESCENDANTS accessibility importance mode 
Ensures accessibility framework is notified when subtree visibility
changes as a result of hiding descendants. Fixes collision between
HAS_TRANSIENT_STATE flag and IMPORTANT_FOR_ACCESSIBILITY mask.

BUG: 11087525
Change-Id: I92dba27350970a09e76b5a878c7604ea06cae197
 2013-10-07 18:28:45 -07:00
Svetoslav Ganov
b20d63a671 Make the print dialog floating. 
The print dialog was full-screen which was not really needed and was
causing the dialog to jump instead of animate up/down when the IME
shows/hides.

bug:11116648

Change-Id: Ifb46fd80a90948270a1fa9c875258b8d0cdfc111
 2013-10-07 18:21:59 -07:00
Alan Viverette
550b89e6de am 80fad292: am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit '80fad292318ac2e1e76435bb8334017a702a62d7':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:17:37 -07:00
Alan Viverette
80fad29231 am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit '6d774ac6049de8bf347a735eb67c491bb2623aa1':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:15:05 -07:00
Alan Viverette
6d774ac604 am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit 'bdae814816085ac9d4a48580e86a7ef4a0bcb5d6':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:11:45 -07:00
Alan Viverette
bdae814816 Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 2013-10-08 01:09:00 +00:00
Jim Miller
66b102b623 am c2cbd158: am c4c52ccb: am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev 
* commit 'c2cbd158b4989a476bccdaea7a9463d494005c6f':
  Disable camera and search from some security screens.
 2013-10-07 18:08:47 -07:00
Alan Viverette
516f953a82 resolved conflicts for merge of e4ccb864 to master 
Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22
 2013-10-07 18:05:09 -07:00
Jim Miller
c2cbd158b4 am c4c52ccb: am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev 
* commit 'c4c52ccbaafccd1626bc8455641c3f9fc25b023c':
  Disable camera and search from some security screens.
 2013-10-07 17:54:44 -07:00
Alan Viverette
e4ccb864e8 am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:54:42 -07:00
Jean-Michel Trivi
f90299dfbc am 47f698b8: am c38c93f4: am 1a1e24f1: Merge "Update RemoteController info when enabling/disabling it" into klp-dev 
* commit '47f698b88e8be919f3cc0400fa9f1076c1df037c':
  Update RemoteController info when enabling/disabling it
 2013-10-07 17:53:34 -07:00
Jim Miller
c4c52ccbaa am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev 
* commit '961d2f4643e9b3f6f774ab9567c36f659f423254':
  Disable camera and search from some security screens.
 2013-10-07 17:51:33 -07:00
Alan Viverette
1bdbdfbe6a am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '6930d3805e1f0e770c636b8419a105bc19919048':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:51:30 -07:00
Jean-Michel Trivi
47f698b88e am c38c93f4: am 1a1e24f1: Merge "Update RemoteController info when enabling/disabling it" into klp-dev 
* commit 'c38c93f4deb80d1df7acf915cdf2df17cc7cc548':
  Update RemoteController info when enabling/disabling it
 2013-10-07 17:50:08 -07:00
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
9c27a4dff5 am e5812347: am 9aa58405: am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev 
* commit 'e581234746cc977de62f3d1a495669833710eb39':
  Fix crash in built-in wallpaper cropper
 2013-10-07 17:30:23 -07: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
Craig Mautner
4964584d39 am 4a38b0ab: am 972a9855: am b729e995: Merge "Yet more debugging for 10858941." into klp-dev 
* commit '4a38b0ab92b565547777df6959516325058f73d0':
  Yet more debugging for 10858941.
 2013-10-07 17:23:35 -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
Michael Wright
839dae4a96 am d07179ba: am 7c677bb8: am bf33f34c: Merge "Show no_sim icon when no SIM card is available." into klp-dev 
* commit 'd07179ba2343713685a546d7f8b14bf49d9b5a5c':
  Show no_sim icon when no SIM card is available.
 2013-10-07 17:19:51 -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
Baligh Uddin
4814916e88 am 49c1b2ac: (-s ours) am ceb436ec: (-s ours) am 29cd41db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '49c1b2ace9fe38f0431fdb4516af9dff1359a053':
  Import translations. DO NOT MERGE
 2013-10-07 17:12:51 -07:00
Baligh Uddin
ec4068e22a am 61438f5f: (-s ours) am 01e1ecd0: (-s ours) am 8fcb6a56: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '61438f5ff5aa1137b881a71a7b2b54223ff1f625':
  Import translations. DO NOT MERGE
 2013-10-07 17:12:48 -07:00
Baligh Uddin
95155bcf11 am 370933a7: (-s ours) am fb93b65b: (-s ours) am f78c7884: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '370933a76eb8d3ff5ed72f1dc12d03b8c7ea9170':
  Import translations. DO NOT MERGE
 2013-10-07 17:12:45 -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
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