Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,192 Commits 3 Branches 0 Tags
df0ddff7e1e489165a8e81afffd031d217e338b6
Commit Graph

27396 Commits

Author SHA1 Message Date
Dianne Hackborn
df0ddff7e1 am 8b7c81c7: am 3c78702d: Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev 
* commit '8b7c81c782947cf2614e246daa91a0b8a9fa1f0d':
  Maybe fix issue #7146119: exception in FragmentManager
 2012-09-13 14:04:03 -07:00
Makoto Onuki
8d715a9c7f am 599023f6: am b11b9fc9: Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 
* commit '599023f639556b3c2657eb77c101db4696e15af4':
  A new broadcast action which is sent when profile changes
 2012-09-13 03:21:46 -07:00
Dianne Hackborn
3c78702db5 Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev 2012-09-12 17:04:42 -07:00
Selim Gurun
4c6e2bb822 am 2d449a48: am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 
* commit '2d449a482c08d87a0d5409c1dda0695db0843c77':
  Minor update to addjavascriptinterface documentation
 2012-09-12 17:03:11 -07:00
Fabrice Di Meglio
ee5be7a5e7 am 465858e7: am 2cd35662: Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev 
* commit '465858e779a79e88514a8b28df58bc089a0ee62b':
  Fix SeekBar when in RTL layout direction
 2012-09-12 17:03:06 -07:00
Fabrice Di Meglio
2b668afc11 am 47e39a9f: am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 
* commit '47e39a9f61ae5ffdcb912c1f6196dd6f8e7478b5':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
 2012-09-12 17:03:02 -07:00
Fabrice Di Meglio
297ecb3374 am 215ce60a: am b9674640: Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 
* commit '215ce60a406c13d6963db24cc0a361da0eb64897':
  Enforce encapsulation for MarginLayoutParams startMargin and endMargin
 2012-09-12 17:02:58 -07:00
Selim Gurun
36562741f9 am 6e28f1aa: am 4f8da32f: Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 
* commit '6e28f1aacfa4c82ab0c8b740a24ed233b031272f':
  Make JavascriptInterface annotation public.
 2012-09-12 17:02:51 -07:00
Brian Carlstrom
0829a09f72 am 2e96c791: am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev 
* commit '2e96c791e24454cf55144c64fe77321a31b746fe':
  Tracking upgrade to bouncycastle 1.47
 2012-09-12 17:02:47 -07:00
Kristian Monsen
f77e52e110 am 5710a2f1: am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 
* commit '5710a2f1269180c169855b98a8d33f2f12ced1a1':
  Deprecating methods (and a constant) for JB MR1
 2012-09-12 17:02:11 -07:00
Jeff Sharkey
116be95495 Merge commit '81eb7640' into mergeit 
Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350
 2012-09-12 16:34:31 -07:00
Makoto Onuki
b11b9fc997 Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 2012-09-12 16:11:13 -07:00
Svetoslav Ganov
d381c620ed am 2b5c5b64: am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev 
* commit '2b5c5b640d170518ac9ddc289a49340e54ff39d0':
  Screen magnifier should handle window rebuilds correctly.
 2012-09-12 15:34:32 -07:00
Christopher Tate
a25bbca8cc am ae25805d: am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev 
* commit 'ae25805d2063d81d3e8ae786b0d972b666c5cf18':
  Set up default (random) Android IDs for all users
 2012-09-12 15:34:18 -07:00
Robert Greenwalt
dd912320ff am f02e72d9: am f008ab72: am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit 'f02e72d99f5d1fc05ea31676d13e7fd1e8b65c1f':
  EthernetDataTracker: indicate link up based on flags
 2012-09-12 15:34:09 -07:00
Selim Gurun
c5c68d9789 am 77f02ca9: am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev 
* commit '77f02ca908e114df2e14a7671824f3374a509280':
  Deleting the defunct SearchBox interface.
 2012-09-12 15:28:53 -07:00
Jeff Brown
984f157366 am 2eb82513: am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev 
* commit '2eb82513bd448757250dc8245e9c29c747397608':
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.
 2012-09-12 15:28:20 -07:00
Selim Gurun
2137aa2afc am cccad2d8: am faed98a1: Merge "Added annotations for injected accessibility objects" into jb-mr1-dev 
* commit 'cccad2d8c2ea309a73b9408f8c36e7d964627570':
  Added annotations for injected accessibility objects
 2012-09-12 15:15:04 -07:00
Adam Cohen
3f3a60a037 am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev 
* commit '2664f94f209100abacbfc857c33eac784f0fd6cf':
  Adding notion of keyguard widgets
 2012-09-12 15:14:57 -07:00
Eino-Ville Talvala
21616b27ff am 64791aab: am ff5c9146: Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev 
* commit '64791aabd4f16df4adf5ec6adf97aa2b0633dd6c':
  NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
 2012-09-12 15:14:35 -07:00
Svetoslav Ganov
bb4a9840a5 am 7abd5cfa: am c574fd04: Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev 
* commit '7abd5cfacf3be80f79d4a01f1a60b4b7bfb411f6':
  Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
 2012-09-12 15:14:21 -07:00
Selim Gurun
41ecd35fd9 am 3591fa3b: am 2fa10c67: Fix build break 
* commit '3591fa3bcd6c5204c6b0d470a186535b65b14042':
  Fix build break
 2012-09-12 15:14:09 -07:00
Eino-Ville Talvala
ef492d3da3 am 94aa95be: am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev 
* commit '94aa95beca8482bb8f5cf9f9bd0c26b9738d2f51':
  Camera: Add SCENE_MODE_HDR.
 2012-09-12 15:14:05 -07:00
Eino-Ville Talvala
e8eb5951b2 am 9725ff46: am 6fc7275d: Merge "Camera: Add enableShutterSound method." into jb-mr1-dev 
* commit '9725ff46c445f9d259bdee18ed86072a937ba117':
  Camera: Add enableShutterSound method.
 2012-09-12 15:13:46 -07:00
Selim Gurun
5977ecef0e am a7a5fa82: am 06ee8cde: Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev 
* commit 'a7a5fa82cc997953b0206c4dd1d2ecc1b27f0cf2':
  Remove defunct searchbox implementation from webview.
 2012-09-12 15:13:43 -07:00
Selim Gurun
f4fd2eb5ee Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 2012-09-12 13:41:09 -07:00
Selim Gurun
b4c02e6ffd Minor update to addjavascriptinterface documentation 
Change-Id: I67525673e3d061e00fbe8989c08050ad84e78920
 2012-09-12 13:36:21 -07:00
Fabrice Di Meglio
2cd35662ca Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev 2012-09-12 13:28:17 -07:00
Fabrice Di Meglio
8872465709 Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 2012-09-12 13:26:56 -07:00
Fabrice Di Meglio
b967464049 Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 2012-09-12 13:25:22 -07:00
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
Selim Gurun
4f8da32ffa Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 2012-09-12 12:48:32 -07:00
Dianne Hackborn
f41d25a2f5 resolved conflicts for merge of 8bb779bd to master 
Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052
 2012-09-12 10:55:03 -07:00
Brian Carlstrom
0efca17105 Tracking upgrade to bouncycastle 1.47 
Change-Id: I4a3c508c5e65dd46a2df22935b5351092550fad5
 2012-09-12 10:01:00 -07:00
Kristian Monsen
bd0fe87834 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 2012-09-12 09:34:37 -07:00
Selim Gurun
e91d5bee24 Make JavascriptInterface annotation public. 
Bug: 7073422

This change makes @JavascriptInterface public and it requires
using this annotation to allow javascript access to public java
methods for API level JELLY_BEAN_MR1 and above. The behavior
does not change for API levels JELLY_BEAN and below.

Change-Id: I4108b17cf71b9ac273d7b61b1c8f7f5581e922ee
 2012-09-12 08:04:26 -07:00
Jeff Sharkey
b049e212ab Include user identifier in external storage paths. 
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

Since Environment is created before Zygote forks, we need to update
its internal paths after each process launches.

Bug: 7131382
Change-Id: I6f8c6971f2a8edfb415c14cb4ed05ff97e587a21
 2012-09-11 23:11:14 -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
Fabrice Di Meglio
06849e8f53 Fix SeekBar when in RTL layout direction 
- set correct thumb position depending on layout direction

Change-Id: Ibc489295d28792ec7556ce3484b2d1ae47a4c704
 2012-09-11 19:38:10 -07:00
Makoto Onuki
90ddc9040c A new broadcast action which is sent when profile changes 
Adding it as a hidden API for now.  Should be made public later.

Bug 7148705

Change-Id: I6f5fbb8048728f355341ecdc6fd0242b45171d56
 2012-09-11 18:22:53 -07:00
Fabrice Di Meglio
be06e3292b Fix bug #7148393 Switch can crash when hierarchyviewer is connected 
Change-Id: I1713138a60358cc76f6cf373082a94199e85c717
 2012-09-11 17:42:45 -07:00
Fabrice Di Meglio
a40627daee Enforce encapsulation for MarginLayoutParams startMargin and endMargin 
Change-Id: Ibaf5ade22612dfa52173978e4b520a6407162d13
 2012-09-11 17:16:36 -07:00
Dianne Hackborn
8d5e6f8d4a Maybe fix issue #7146119: exception in FragmentManager 
Seems like we should never be dispatching input events to windows
that currently don't have focus.

Change-Id: I524796df69f3fdda4147cb37e7b85b79bad88762
 2012-09-11 16:19:47 -07:00
Svetoslav Ganov
0bb4d078af Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev 2012-09-11 15:52:33 -07:00
Svetoslav Ganov
9b4125e435 Screen magnifier should handle window rebuilds correctly. 
1. The way for computing the magnified region was simplistic and
   incorrect. It was ignoring window layering resulting in broken
   behavior. For example, if the IME is up, then the everything else
   is magnifed and the IME not. Now the keyguard appears and covers
   the IME but the magnified region does not expand while it would
   since the keyguard completely covers the not magnified IME window.

bug:7138937

Change-Id: I21414635aefab700ce75d40f3e913c1472cba202
 2012-09-11 15:50:58 -07:00
Christopher Tate
99c0cb3b9d Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev 2012-09-11 15:20:34 -07:00
Robert Greenwalt
f008ab727e am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '5d33e76cff65245d03f592a3dbcbf2e17a2f1581':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:09:11 -07:00
Robert Greenwalt
5d33e76cff am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:04:50 -07:00