Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,919 Commits 3 Branches 0 Tags
9a605bcfe07bc2ce598d528d83f150aa046d42d3
Commit Graph

27328 Commits

Author SHA1 Message Date
John Spurlock
4170af8bab am 6beb7220: am 9f750af6: Update the dream manager to be multi-user aware. 
* commit '6beb72204346fe75f763592462c9bc2a0b560533':
  Update the dream manager to be multi-user aware.
 2012-09-12 13:17:57 -07:00
Dianne Hackborn
dea6f14dc0 Merge "resolved conflicts for merge of 8bb779bd to master" 2012-09-12 13:15:07 -07:00
Dianne Hackborn
f41d25a2f5 resolved conflicts for merge of 8bb779bd to master 
Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052
 2012-09-12 10:55:03 -07:00
Geremy Condra
c3ec0d01a6 Push event logging down into libcore.EventLogger 
This changes the default behavior of the EventLogger from logging
to the normal logs to logging to the event logs.

Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8
 2012-09-11 21:29:06 -07:00
John Spurlock
9f750af6c1 Update the dream manager to be multi-user aware. 
Dream settings are stored per-user, so dream manager operations
must act according to the calling or current user.

Bug:7041514
Change-Id: I4a0bbbd76886e6440b1afd89c61af5f4569b0e18
 2012-09-11 09:50:23 -04:00
Dianne Hackborn
0bac8bcbcc Merge "Animations for user switching." into jb-mr1-dev 2012-09-10 21:04:55 -07:00
Dianne Hackborn
9d9ece3c1e Animations for user switching. 
The window manager now has a facility to provide a full-screen
animation, which the activity manager uses every time a user
switch happens.

The current animation is just a simple dumb slide until we get
a design from UX.

Also some cleanup: moved the portrait task animations to the
default config so we always have an animation for them, and finally
got the java symbol stuff out of public.xml.

Change-Id: I726f77422b2ef5f2d98f961f8da003e045f0ebe8
 2012-09-10 19:58:21 -07:00
Christopher Tate
272e2a5cec am 23e03832: am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev 
* commit '23e038323dc79c3d5355ba4b4b77060a763a1a91':
  Miscellaneous fixes for Settings
 2012-09-10 19:25:29 -07:00
Christopher Tate
e1f02ef080 Merge "Miscellaneous fixes for Settings" into jb-mr1-dev 2012-09-10 19:21:53 -07:00
Selim Gurun
6eb6157da6 am d2d3bff2: am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev 
* commit 'd2d3bff22c339bc30452a6c79b703b6d22f08d3b':
  Control access to inherited methods of jsinterface objects
 2012-09-10 18:21:14 -07:00
Christopher Tate
d5fe147924 Miscellaneous fixes for Settings 
(1) It's okay to write literal null as a settings element value
(2) Properly convey the user handle in the put-for-user variant

Bug 7137201
Bug 7139826

Change-Id: I0ed77d65e8377f0e0580a2668f10b7167ad34928
 2012-09-10 17:32:39 -07:00
John Reck
8627875d1c am 814b9a6c: am bdf8fa0c: Merge "Fix some destroy bugs" into jb-mr1-dev 
* commit '814b9a6cc161da3ec5c897783776faf48877d2e5':
  Fix some destroy bugs
 2012-09-10 17:16:53 -07:00
Katie McCormick
211ae7472f am 757e5600: am a25526ae: am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '757e5600d5bc7762d65e682de13ba9fbd0476eea':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-10 17:16:45 -07:00
Siva Velusamy
fbd598fc10 am 5b5d482c: am bc91c5f8: Merge "Report the user id of every app to ddms." into jb-mr1-dev 
* commit '5b5d482c0c6a048c4a95b63359226ec9015012e9':
  Report the user id of every app to ddms.
 2012-09-10 17:16:33 -07:00
Dianne Hackborn
9d8d90b59d am 31c95b93: am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev 
* commit '31c95b93c64601994732dda6ed9de7c44f838596':
  USER_CURRENT_OR_SELF had the same int as USER_CURRENT!
 2012-09-10 17:16:25 -07:00
Dianne Hackborn
3dd94ced96 am 206aa76c: am 4573e29f: Merge "Flesh out multi-user in am commands." into jb-mr1-dev 
* commit '206aa76cdce6bc9697833f4657e7fc5de4d8f065':
  Flesh out multi-user in am commands.
 2012-09-10 17:16:20 -07:00
Victoria Lease
57ff180fe9 am 64a5c4cf: am d7f5a51b: Merge "IME support for trackball and generic motion events" into jb-mr1-dev 
* commit '64a5c4cf2f53c11b1a9141228a39ea4305b856fc':
  IME support for trackball and generic motion events
 2012-09-10 17:15:57 -07:00
Chet Haase
d1651064ab am d8f68060: am e11dc0dd: Merge "Fix clone() for Animators with just a \'to\' value" into jb-mr1-dev 
* commit 'd8f680601da495a084bacb347e1dddf1313b4cc7':
  Fix clone() for Animators with just a 'to' value
 2012-09-10 17:15:42 -07:00
Svetoslav Ganov
e607dd880d am ef94c988: am 1434e29a: Merge "Check for null ViewRootImpl when saving accessibility focus in ListView." into jb-mr1-dev 
* commit 'ef94c988a2caf503a730686f3259385b0f4e4e2f':
  Check for null ViewRootImpl when saving accessibility focus in ListView.
 2012-09-10 17:14:58 -07:00
Wu-cheng Li
f87bc01766 am 774f1fca: am 753e1280: Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 
* commit '774f1fca6fff5ba9ecd5a7db9548f6644cfaff27':
  Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
 2012-09-10 17:13:37 -07:00
Dianne Hackborn
9e0709c6fb am 1d0467ae: am 8727a731: Merge "A little cleanup." into jb-mr1-dev 
* commit '1d0467ae1d7207c9a115241e17361442bb343f0f':
  A little cleanup.
 2012-09-10 17:12:02 -07:00
Jeff Brown
251193c05a am fbb2da7a: am a3909a93: Work around crash when display is removed. 
* commit 'fbb2da7a4d3588a9deea835e4b94d1c3547735e4':
  Work around crash when display is removed.
 2012-09-10 17:10:56 -07:00
Jeff Brown
496e48466f am d07934db: am 20ec8ac5: Merge "Improve Wifi display discovery API." into jb-mr1-dev 
* commit 'd07934dbc60d3f52c8133ae8249ef3d609ff2751':
  Improve Wifi display discovery API.
 2012-09-10 17:10:40 -07:00
Amith Yamasani
b69fc7b54c am 46148f22: am 8f008e73: Merge "More multi-user methods in PM" into jb-mr1-dev 
* commit '46148f22650e4e390a9488a2d31d0acd641eeffa':
  More multi-user methods in PM
 2012-09-10 17:10:32 -07:00
Jeff Brown
b61469c513 am de758bd0: am 1edf63ef: Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev 
* commit 'de758bd07df9bacb2c95ba9d00b3693b4e40b96b':
  Enable auto-brightness adjustment feature with system prop.
 2012-09-10 17:10:19 -07:00
Jeff Brown
b6e9976497 am fb7a8045: am b0d10aa9: Merge "Add new wifi display discovery API." into jb-mr1-dev 
* commit 'fb7a80459206322468144029c06e38c084b35255':
  Add new wifi display discovery API.
 2012-09-10 17:10:14 -07:00
Dianne Hackborn
234f00b9e8 am 789203ec: am 5d75052b: Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev 
* commit '789203ec530e61f7678c9883a67135bf8cd3c679':
  Add Binder.getCallingUserHandle().
 2012-09-10 17:09:33 -07:00
Jeff Brown
8eee7890c1 am 54b7362c: am 7017e483: Merge "Add support for Wifi display." into jb-mr1-dev 
* commit '54b7362cd676e34a9492eba4b463d04b454b26d8':
  Add support for Wifi display.
 2012-09-10 17:08:33 -07:00
rich cannings
c491c1bf06 am d6870d9a: am 1275abd0: Merge "Move verification settings to Settings.Global" into jb-mr1-dev 
* commit 'd6870d9a3d9a9104ae54abfbd2876206c180b925':
  Move verification settings to Settings.Global
 2012-09-10 17:08:26 -07:00
Chet Haase
be6665a933 am 39b72a7a: am 89b3f48f: Merge "Enable changing properties of layer paint" into jb-mr1-dev 
* commit '39b72a7aaef1f7a5b7e43a6d0fe5a619b303fe66':
  Enable changing properties of layer paint
 2012-09-10 17:06:53 -07:00
Dianne Hackborn
3f6f96b526 am 00b7d2a0: am 649d0d71: Merge "More multi-user stuff:" into jb-mr1-dev 
* commit '00b7d2a0de5d235f7eab721d4369bf93af512351':
  More multi-user stuff:
 2012-09-10 17:06:32 -07:00
Christopher Tate
06e6fb78ec am 041aa46a: am 970683c5: Merge "Further fixup of migration to global settings" into jb-mr1-dev 
* commit '041aa46a851f9e6d4e80b98f0c9cbe2ec89faec7':
  Further fixup of migration to global settings
 2012-09-10 17:06:00 -07:00
Teng-Hui Zhu
607caa925c am f6cc1ddc: am 4db5d23d: Merge "Back key to dismiss full screen video" into jb-mr1-dev 
* commit 'f6cc1ddc35d30a7314201011353840bd0aa8935b':
  Back key to dismiss full screen video
 2012-09-10 17:05:48 -07:00
Svetoslav Ganov
8d3d852243 am eef5dc63: am 390a06b8: Merge "Restore accessibility focus after ListView layout." into jb-mr1-dev 
* commit 'eef5dc63d805f39eb0c68c93980a7ae728db3f7f':
  Restore accessibility focus after ListView layout.
 2012-09-10 17:05:06 -07:00
Romain Guy
d9d1721812 am 45aef365: am 6543c292: Merge "The drawables cache strikes again Bug #7117785" into jb-mr1-dev 
* commit '45aef365f6087e6cca6fce480e6230a9eb35aa6e':
  The drawables cache strikes again Bug #7117785
 2012-09-10 17:05:02 -07:00
Fabrice Di Meglio
24d9c9c9b3 am 8060ee1f: am f6aa537c: Merge "Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction" into jb-mr1-dev 
* commit '8060ee1f11a504da82ebe6ac63a3e741c023837c':
  Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction
 2012-09-10 17:04:58 -07:00
Fabrice Di Meglio
113fce81d8 am c94106d7: am 01fcb728: Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev 
* commit 'c94106d7c9b3bfe5591a1433440cb19d73a9fb5d':
  Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
 2012-09-10 17:04:53 -07:00
Selim Gurun
94740e6c33 Control access to inherited methods of jsinterface objects 
Bug: 7073422

Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.

Change-Id: I41927248e6bc4b09d17c0707c60fe5e6ab681e66
 2012-09-10 16:43:35 -07:00
John Reck
bdf8fa0c1b Merge "Fix some destroy bugs" into jb-mr1-dev 2012-09-10 16:30:19 -07:00
Katie McCormick
a25526ae40 am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '51740d6d786bf583cd46d12beb8515aa00d84bee':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-10 16:27:20 -07:00
Katie McCormick
51740d6d78 am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '0e9f34bffdfc476122337d077453f722fc22038f':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-10 16:25:17 -07:00
Katie McCormick
0e9f34bffd Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
Change-Id: I62def95b138282eba4f2e70fd4ab4de35aa03e89
 2012-09-10 16:20:20 -07:00
John Reck
095e8aa02b Fix some destroy bugs 
Bug: 6961494
 Don't call clearHelpers in destroy(). It is already called
 in onDetach, which is where it needs to be. It can't be
 called by the finalizer

 Switch onCancel listener to onDismiss listener. Fixes an issue
 where destroying can live the webcore thread hung because onCancel
 won't be called, but onDismiss is

Change-Id: I669c389c8c9a81d92c27f88d83bcb711c6c0a5ee
 2012-09-10 16:07:04 -07:00
Siva Velusamy
bc91c5f8b1 Merge "Report the user id of every app to ddms." into jb-mr1-dev 2012-09-10 15:59:36 -07:00
Dianne Hackborn
009ea5a04c Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev 2012-09-10 15:49:59 -07:00
Dianne Hackborn
4573e29faf Merge "Flesh out multi-user in am commands." into jb-mr1-dev 2012-09-10 15:39:02 -07:00
Dianne Hackborn
8a9f5d42a5 USER_CURRENT_OR_SELF had the same int as USER_CURRENT! 
Change-Id: I0f2b0fa4fb82d1f871450b509a7a4d13e9817320
 2012-09-10 15:37:53 -07:00
Dianne Hackborn
1676c856d6 Flesh out multi-user in am commands. 
Now we default to the current user instead of user 0 for most commands
(except where we can do the command for all users).

Many more commands take a user argument: force-stop, kill, profile,
dumpheap.

Improved help text.

Change-Id: I719a13b4d31b668f57ca21e51d7043ac3e0d4e1b
 2012-09-10 14:52:30 -07:00
Siva Velusamy
d693dfa75b Report the user id of every app to ddms. 
This CL extends the HELO and APNM packets to include the user id
of the application. This allows ddms users to differentiate between
the same app running for multiple users.

Bug 7110696.

Change-Id: I490d0e3781b8fb9db65cf81188677a0955650511
 2012-09-10 14:44:38 -07:00
Victoria Lease
d7f5a51baf Merge "IME support for trackball and generic motion events" into jb-mr1-dev 2012-09-10 14:12:48 -07:00