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

118016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
942d0d6a8c am 48f2a25a: am e26c353c: am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit '48f2a25a7ffd2c89ca54e7b1873545a4e3b476f4':
  add xml attributes to IME javadoc
 2013-10-20 15:34:59 -07:00
Scott Main
48f2a25a7f am e26c353c: am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit 'e26c353c4b32f252567887ddb97051546998c6ff':
  add xml attributes to IME javadoc
 2013-10-20 15:32:24 -07:00
Scott Main
e26c353c4b am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit 'bab3348fc39e91b35c30ce05b6222cc5e8544104':
  add xml attributes to IME javadoc
 2013-10-20 15:30:49 -07:00
Scott Main
bab3348fc3 Merge "add xml attributes to IME javadoc" into klp-dev 2013-10-20 22:28:11 +00:00
Nick Kralevich
47d2b61ddb fix javadoc building. 
Change-Id: I2f20b026f5438539ad459a5962da950598158728
 2013-10-19 10:43:55 -07:00
John Spurlock
cb65456fd3 am a5217f09: am 1eeb5ff2: am d4595bd1: Merge "Move the IME navigation guard view up to decor." into klp-dev 
* commit 'a5217f09c5438d1954dd71e2f75de95b1d8f6721':
  Move the IME navigation guard view up to decor.
 2013-10-19 10:11:08 -07:00
John Spurlock
a5217f09c5 am 1eeb5ff2: am d4595bd1: Merge "Move the IME navigation guard view up to decor." into klp-dev 
* commit '1eeb5ff203a4aea5a4cfbe6c9982dc77cabd1f2b':
  Move the IME navigation guard view up to decor.
 2013-10-19 10:07:48 -07:00
John Spurlock
1eeb5ff203 am d4595bd1: Merge "Move the IME navigation guard view up to decor." into klp-dev 
* commit 'd4595bd1e60ba03be3dac3cae3fc2d3ae2433c7d':
  Move the IME navigation guard view up to decor.
 2013-10-19 10:05:23 -07:00
John Spurlock
d4595bd1e6 Merge "Move the IME navigation guard view up to decor." into klp-dev 2013-10-19 17:03:55 +00:00
Nick Kralevich
69002ae2a2 Fix build. 
Change-Id: Icf14e63d759b021b5f9f79f09efa1d101764b9b7
 2013-10-19 08:43:08 -07:00
Jim Miller
332eb8f7eb am 51e4f391: am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 
* commit '51e4f391717deb24ea7b22096df2ddb5535aee00':
  Revert "Fix dodgy states of keyguard transport controls"
 2013-10-18 18:17:47 -07:00
Jim Miller
51e4f39171 am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 
* commit '495bd54c630691811e051247eec87e097c0bb01c':
  Revert "Fix dodgy states of keyguard transport controls"
 2013-10-18 18:14:07 -07:00
Jim Miller
495bd54c63 am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 
* commit '42b7b6927cd31679691b216d1ba09be31c24206e':
  Revert "Fix dodgy states of keyguard transport controls"
 2013-10-18 18:10:57 -07:00
Jim Miller
42b7b6927c Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 2013-10-19 01:08:12 +00:00
Jim Miller
4d20ed3f26 Revert "Fix dodgy states of keyguard transport controls" 
This reverts commit bdb5ac7ddbabec0ba947a32937d8b95738d513dc.

Change-Id: Iea8db9a590a2a3b65d941b2918345eb27f690240
 2013-10-19 01:00:16 +00:00
Jonathan Dixon
1ec0c91f40 am 72950e65: am d47be031: am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit '72950e65c87b2956446d1e7b9dbdc02ef3841774':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:42:18 -07:00
Jonathan Dixon
72950e65c8 am d47be031: am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit 'd47be031378e2ff43d61099ce5502f9428242eaf':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:40:44 -07:00
Jonathan Dixon
d47be03137 am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit '43e533dea968bec3e53ba8046934145a0fa48a4f':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:37:53 -07:00
Svetoslav Ganov
e9ffeac138 am 8a51e2f4: am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit '8a51e2f48cb24113e8463eb251a097080eb46a7f':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:35:31 -07:00
Jonathan Dixon
43e533dea9 Merge "Restore 4 classes that were accidentally deleted" into klp-dev 2013-10-19 00:35:23 +00:00
Svetoslav Ganov
8a51e2f48c am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit 'a53e1f81380c018705dc56ee82ec2db155f23489':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:32:57 -07:00
Svetoslav Ganov
a53e1f8138 am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit '237575278de8cae5d20ee333fcb2ccceee257d67':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:29:05 -07:00
Svetoslav Ganov
237575278d Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 2013-10-19 00:26:44 +00:00
Jonathan Dixon
74fc73f62b Restore 4 classes that were accidentally deleted 
Bug 11291911

These deleted classes were previously public APIs and so need to remain
in the build (but hidden) in order to keep existing apps working.
(Partially reverts Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d)

Change-Id: I28e53b056f41e66645136f5e18fba2ff55a65fe5
 2013-10-18 17:10:34 -07:00
Scott Main
5df0631003 add xml attributes to IME javadoc 
Change-Id: I7a3505753188ba23777391a286d8595ed64777cb
 2013-10-18 16:09:51 -07:00
John Spurlock
ae3349e1c3 Move the IME navigation guard view up to decor. 
Although the IME windows are now allowed to extend into
the nav bar, some IMEs were making assumptions about
computed insets based on the height of the content view.

So our navigation bar view (opaque view blocking the nav bar
area to avoid the island effect when transparent) needs to live
above the content view in the hierarchy, making the content view
the same height as it was before.

A surgical spot to put the guard view is up at the root view
(PhoneWindow.DecorView).  fitSystemWindows is always called since
this view is not recreated, and the layout is stable: waiting until
the IME is attached to the window is too late to add a guard view.

This is above the screen_* layouts, so will work without having to
touch all of them.  And it only affects windows of TYPE_INPUT_METHOD.

Bug:11237795
Change-Id: I6a93f30aec83f1cecfb854073046cbc87ab4aa66
 2013-10-18 18:41:22 -04:00
Scott Main
200223cd0e am 24512c85: am 6f756e56: am 96844ed8: fix javadoc link 
* commit '24512c8586f8a3e0d3c9bff07639f968fe1b3e25':
  fix javadoc link
 2013-10-18 14:56:37 -07:00
Scott Main
24512c8586 am 6f756e56: am 96844ed8: fix javadoc link 
* commit '6f756e561a835d2508b8da71f23075ab7bd1060b':
  fix javadoc link
 2013-10-18 14:54:11 -07:00
Scott Main
6f756e561a am 96844ed8: fix javadoc link 
* commit '96844ed886cc887a34bfc2fd04fc569d9c098623':
  fix javadoc link
 2013-10-18 14:50:54 -07:00
Scott Main
96844ed886 fix javadoc link 
Change-Id: I509fb12393ee0b8bf78ff4110fc18420739f7c58
 2013-10-18 14:43:02 -07:00
John Spurlock
e255d4e78a am 18e82e79: am 0945bc15: am ac2d61a2: Merge "Do not show immersive mode help in touch exploration mode." into klp-dev 
* commit '18e82e7928ec57f7e39e1aa24f8ecbeb40f5e35d':
  Do not show immersive mode help in touch exploration mode.
 2013-10-18 14:20:35 -07:00
John Spurlock
18e82e7928 am 0945bc15: am ac2d61a2: Merge "Do not show immersive mode help in touch exploration mode." into klp-dev 
* commit '0945bc15034ac05d2ca803f6297b03dcbcbea2d8':
  Do not show immersive mode help in touch exploration mode.
 2013-10-18 14:15:29 -07:00
John Spurlock
0945bc1503 am ac2d61a2: Merge "Do not show immersive mode help in touch exploration mode." into klp-dev 
* commit 'ac2d61a2d731946afed300d63039d6d712fd7f4c':
  Do not show immersive mode help in touch exploration mode.
 2013-10-18 14:12:15 -07:00
John Spurlock
ac2d61a2d7 Merge "Do not show immersive mode help in touch exploration mode." into klp-dev 2013-10-18 21:08:58 +00:00
Adam Lesinski
c6e72066ea resolved conflicts for merge of 91b47365 to master 
Change-Id: Ia867c4199556bc1210a31bdeb323d7d12e27eb88
 2013-10-18 13:52:26 -07:00
Adam Lesinski
91b47365f6 am 16e8c4f7: am 7d292145: Merge "Prune unneeded density resources from APK" into klp-dev 
* commit '16e8c4f7db87d743410751410c7f761350792fe2':
  Prune unneeded density resources from APK
 2013-10-18 13:45:19 -07:00
Adam Lesinski
16e8c4f7db am 7d292145: Merge "Prune unneeded density resources from APK" into klp-dev 
* commit '7d292145f1266b9ba4a231498c84265ad5193bdc':
  Prune unneeded density resources from APK
 2013-10-18 13:41:24 -07:00
Adam Lesinski
7d292145f1 Merge "Prune unneeded density resources from APK" into klp-dev 2013-10-18 20:36:58 +00:00
Svetoslav
d431ffbe30 am 1fb5ea38: am 0acad1de: am 30d9161b: Merge "Printer list items have wrong width." into klp-dev 
* commit '1fb5ea38533b0a163194441f4f28cd64a5835446':
  Printer list items have wrong width.
 2013-10-18 13:34:07 -07:00
Svetoslav
2d0391d1ea am bfb51444: am 87841352: am 7f11d0db: Merge "Clear the caller identity when dumping print system state." into klp-dev 
* commit 'bfb5144457638f6ba5e40143c9e2559a0b4f1496':
  Clear the caller identity when dumping print system state.
 2013-10-18 13:34:04 -07:00
Svetoslav
1fb5ea3853 am 0acad1de: am 30d9161b: Merge "Printer list items have wrong width." into klp-dev 
* commit '0acad1de81799f765863118092caef0b6d306df5':
  Printer list items have wrong width.
 2013-10-18 13:30:28 -07:00
Svetoslav
bfb5144457 am 87841352: am 7f11d0db: Merge "Clear the caller identity when dumping print system state." into klp-dev 
* commit '8784135245567a4f234b2704549215ad65ef092b':
  Clear the caller identity when dumping print system state.
 2013-10-18 13:30:25 -07:00
Svetoslav
0acad1de81 am 30d9161b: Merge "Printer list items have wrong width." into klp-dev 
* commit '30d9161b8e84652d9ac504b70adacaf729fdb58b':
  Printer list items have wrong width.
 2013-10-18 13:28:32 -07:00
Svetoslav
8784135245 am 7f11d0db: Merge "Clear the caller identity when dumping print system state." into klp-dev 
* commit '7f11d0db2da2fefe5e1ee4d34df0aee2c26863b7':
  Clear the caller identity when dumping print system state.
 2013-10-18 13:28:28 -07:00
Svetoslav
30d9161b8e Merge "Printer list items have wrong width." into klp-dev 2013-10-18 20:27:06 +00:00
Svetoslav
7f11d0db2d Merge "Clear the caller identity when dumping print system state." into klp-dev 2013-10-18 20:26:38 +00:00
Deepanshu Gupta
c0b9317420 am 02b6e6b1: (-s ours) am 5a6541eb: am b4f33d8f: Merge "Layoutlib Create: Remove references to java package class Objects." into klp-dev 
* commit '02b6e6b19115a93786ed732c39a2d363214fa2f2':
  Layoutlib Create: Remove references to java package class Objects.
 2013-10-18 13:15:37 -07:00
Svetoslav Ganov
858a1850e2 Hide the print dialog if the printing activity is destroyed. 
1. For an app to print it creates a PrintDocumentAdapter implementation
   which is passed to the print dialog activity. If the activity that
   created the adapter is destroyed then the adapter, which may rely on
   the activity state, may be in an invalid state. For example, an app
   creates an adapter and calls print resuting in the app activity and
   the print dialog activity being stacked. Now the user rotates the
   device which triggers the recreating of the activity stack (assume the
   app does not handle rotation). The recreated print dialog activity
   receives the intent that originally created it with containing the
   adapter that was constructed in the context of the old, now destroyed,
   app activity instance.

   To handle this we are limiting an app to be able to print only from
   and activity and when this activity is destroyed we mark the adapter
   as invalid which will result in hiding the print dialog activity. Note
   that if the app process is killed we already handle this in the print
   dialog activiy by registering a death recipient on the adapter binder.

2. In the PrintManager.PrintDocumentAdapterDelegate some of the state is
   accessed only on the main thread and some from miltiple threads. The
   code was trying to avoid locking for state that is not accessed by
   multiple threads but this is error prone and the benefit does not
   justify the complexity and added fragility. Now grabbing a lock all
   the time.

3. The PrintJobConfigActivity waits for it to bind to the print spooler
   service before instantiating its print controller and editor. However,
   these can be accessed by invoking some of the activity cycle callbacks.
   This change is adding null checks for the case where the activity
   callbacks are called before the binding to the spooler is completed.

bug:11242661

Change-Id: Id906b3170e4f0a0553772dfa62686f06fdca0eaf
 2013-10-18 13:12:06 -07:00
Deepanshu Gupta
02b6e6b191 am 5a6541eb: am b4f33d8f: Merge "Layoutlib Create: Remove references to java package class Objects." into klp-dev 
* commit '5a6541ebc787c5a54e89c0bf65f029660778736a':
  Layoutlib Create: Remove references to java package class Objects.
 2013-10-18 13:09:58 -07:00
Deepanshu Gupta
5a6541ebc7 am b4f33d8f: Merge "Layoutlib Create: Remove references to java package class Objects." into klp-dev 
* commit 'b4f33d8f3e5926c29d848680834006bc455110c1':
  Layoutlib Create: Remove references to java package class Objects.
 2013-10-18 13:06:34 -07:00