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

115911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Daniel Sandler
900ece502f Do not show immersive mode help in touch exploration mode. 
Bug: 11277364
Change-Id: Ifafcbff38e34c0ef08d9a466d93ce591369183a3
 2013-10-18 16:05:07 -04:00
Deepanshu Gupta
b4f33d8f3e Merge "Layoutlib Create: Remove references to java package class Objects." into klp-dev 2013-10-18 20:04:20 +00:00
Elliott Hughes
9f13a608a7 am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after casts." 
* commit '2ec939bac6263fefee2605d2b50136955cfcba6d':
  Fix whitespace issues after casts.
 2013-10-18 12:11:42 -07:00
Elliott Hughes
f585655b4e am 4a5b3f0a: am ac6e036a: Merge "Remove dependency on jniGetNonMovableArrayElements." 
* commit '4a5b3f0ad0b742fbdce154236b15185aaff87ffb':
  Remove dependency on jniGetNonMovableArrayElements.
 2013-10-18 12:11:38 -07:00
Elliott Hughes
2ec939bac6 am cf4c7bdd: Merge "Fix whitespace issues after casts." 
* commit 'cf4c7bdd1c108345596ebf77ab9c853da9235de5':
  Fix whitespace issues after casts.
 2013-10-18 12:07:52 -07:00
Elliott Hughes
4a5b3f0ad0 am ac6e036a: Merge "Remove dependency on jniGetNonMovableArrayElements." 
* commit 'ac6e036a787de7582ec1556038f7170b3a020fcb':
  Remove dependency on jniGetNonMovableArrayElements.
 2013-10-18 12:07:43 -07:00
Daniel Sandler
06e75cf4ed am 62c19871: am da35dded: Relayout the immersive cling in the correct thread. 
* commit '62c198719afa30eaaa0fe52caed5ed8c520ba6ce':
  Relayout the immersive cling in the correct thread.
 2013-10-18 11:43:14 -07:00
Daniel Sandler
62c198719a am da35dded: Relayout the immersive cling in the correct thread. 
* commit 'da35dded4d7882567eab913b25a7cf2f456d2543':
  Relayout the immersive cling in the correct thread.
 2013-10-18 11:39:43 -07:00
Elliott Hughes
cf4c7bdd1c Merge "Fix whitespace issues after casts." 2013-10-18 18:05:27 +00:00
Mathieu Chartier
6ecb7a9a27 Fix whitespace issues after casts. 
Change-Id: Ief3e50fbedd193e22509aac783f16ba1288908de
 2013-10-18 11:04:31 -07:00
Elliott Hughes
ac6e036a78 Merge "Remove dependency on jniGetNonMovableArrayElements." 2013-10-18 18:01:12 +00:00
Mathieu Chartier
7384b428c4 Remove dependency on jniGetNonMovableArrayElements. 
jniGetNonMovableArrayElements is not safe and is going to be deleted.

Change-Id: I6daae1e4ac9e01ca593cda522fdbeb774eef1eff
(cherry picked from commit 75a5038849cecf38aba72721272ff07cca09501f)
 2013-10-18 10:58:25 -07:00
Daniel Sandler
da35dded4d Relayout the immersive cling in the correct thread. 
Bug: 11266364
Change-Id: Ia629262ff0c362a5a45b6c5822be080cefcb8c56
 2013-10-18 12:05:04 -04:00
Deepanshu Gupta
45f5cd49fa Layoutlib Create: Remove references to java package class Objects. 
Remove references to Java 7 class java.util.Objects and replace it with
a new class that can be loaded on Java 6.

Change-Id: Ibbd9b20b8bc89e247f1d0c48d743d06d1a4f0704
 2013-10-17 20:06:44 -07:00
Jeff Brown
83bf440440 am 3e3296e5: am 82f31701: Merge "Log view root, input and looper state in bug reports." into klp-dev 
* commit '3e3296e526663306237fe551527146286e14f4e4':
  Log view root, input and looper state in bug reports.
 2013-10-17 19:13:30 -07:00
Deepanshu Gupta
d32ebf5744 am ddc069cb: am 6c3a638d: Merge "Fix layoutlib for KK" into klp-dev 
* commit 'ddc069cbb0a7edd289f4920ab42dca7e8111a359':
  Fix layoutlib for KK
 2013-10-17 19:13:23 -07:00
Deepanshu Gupta
188d519ec5 am e1abede3: am 29cf698d: Merge "Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView" into klp-dev 
* commit 'e1abede32fc913098b7c449e3369eb1d5bda77e2':
  Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView
 2013-10-17 19:13:19 -07:00
Jeff Brown
1a53f76d52 am 86ca500e: am f10ba7c7: Merge "Make dump messages asynchronous." into klp-dev 
* commit '86ca500ed14a524c467596cc7c663b88db72038d':
  Make dump messages asynchronous.
 2013-10-17 19:13:16 -07:00
Jeff Brown
3e3296e526 am 82f31701: Merge "Log view root, input and looper state in bug reports." into klp-dev 
* commit '82f31701141f5c3057b162cba1d57f78cbad5091':
  Log view root, input and looper state in bug reports.
 2013-10-17 19:10:00 -07:00
Deepanshu Gupta
ddc069cbb0 am 6c3a638d: Merge "Fix layoutlib for KK" into klp-dev 
* commit '6c3a638dd852634097447ca7fea9210539529110':
  Fix layoutlib for KK
 2013-10-17 19:09:56 -07:00
Deepanshu Gupta
e1abede32f am 29cf698d: Merge "Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView" into klp-dev 
* commit '29cf698d1a0b015408e86c0fce2b0783fda86b92':
  Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView
 2013-10-17 19:09:53 -07:00