Commit Graph

25041 Commits

Author SHA1 Message Date
Eino-Ville Talvala
caea2213d5 am f353f948: Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev
* commit 'f353f948a5867fb43c9ee1dbec1ebc93f91655ec':
  NEW_API: Unhide android.hardware.Camera#enableShutterSound
2012-09-13 11:18:09 -07:00
Eino-Ville Talvala
f353f948a5 Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev 2012-09-13 11:15:15 -07:00
Geremy Condra
f60921d921 Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev
* changes:
  DO NOT MERGE Push event logging down into libcore.EventLogger
  DO NOT MERGE Added event logging for config installation failures.
  DO NOT MERGE Create intermediate directories when installing config data.
  DO NOT MERGE Add components for the Android Config Updater to system server.
2012-09-13 10:42:22 -07:00
Jeff Sharkey
e2332dfc3b am cae22d83: Merge "Give DefaultContainerService all external storage." into jb-mr1-dev
* commit 'cae22d83a7225c38ef6f51723e13d5741d1cd69b':
  Give DefaultContainerService all external storage.
2012-09-13 01:34:30 -07:00
Jeff Sharkey
cae22d83a7 Merge "Give DefaultContainerService all external storage." into jb-mr1-dev 2012-09-13 01:31:04 -07:00
Jeff Sharkey
dfa45309e0 Give DefaultContainerService all external storage.
Now we can bind to just one instance of DCS, instead of requiring
one-per-user. This also means we can operate on otherwise-stopped
users.

Bug: 7003520
Change-Id: I4881e064ae8942907f6a02c6b868926223455cdc
2012-09-13 01:04:15 -07:00
Dianne Hackborn
6ba04590de am 3e451fa1: Merge "New permissions UI, again." into jb-mr1-dev
* commit '3e451fa128e5b7beb22b413eb5600d6c980e5a29':
  New permissions UI, again.
2012-09-12 21:39:06 -07:00
Dianne Hackborn
7454d3b73c New permissions UI, again.
Change-Id: I0bbecd88ff1f212b30d1ef32d5bcaa49cdf1e9ce
2012-09-12 18:57:07 -07:00
Geremy Condra
69689a7356 DO NOT MERGE 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

Conflicts:

	core/java/android/app/ActivityThread.java
2012-09-12 17:54:10 -07:00
Christopher Tate
32ad490c12 am 79cf1a22: Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev
* commit '79cf1a22914aa8ca245a6ca598348bbbb19ff9a6':
  Moved a few telephony settings from Secure to Global
2012-09-12 17:53:48 -07:00
Christopher Tate
79cf1a2291 Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev 2012-09-12 17:51:36 -07:00
Fabrice Di Meglio
9b9a28339f am bbbb154c: Merge "Fix Javadoc spelling" into jb-mr1-dev
* commit 'bbbb154c8986f5c731f159ec6d043945b896183b':
  Fix Javadoc spelling
2012-09-12 17:43:56 -07:00
Christopher Tate
c868b645b4 Moved a few telephony settings from Secure to Global
Also tidy up the bookkeeping for a few settings that were earlier
moved to Global without the redirect tables being fixed up.

Change-Id: I69275db3b2636cd6ba9c8c51b88e97d8ba4b7b7d
2012-09-12 17:42:43 -07:00
Fabrice Di Meglio
bbbb154c89 Merge "Fix Javadoc spelling" into jb-mr1-dev 2012-09-12 17:41:27 -07:00
Chet Haase
4277f86c63 am 0c348b6d: Merge "end() a reverse()\'d animation correctly" into jb-mr1-dev
* commit '0c348b6dd734e1d10d3b51ea95f60900789f0310':
  end() a reverse()'d animation correctly
2012-09-12 17:32:53 -07:00
Chet Haase
0c348b6dd7 Merge "end() a reverse()'d animation correctly" into jb-mr1-dev 2012-09-12 17:30:16 -07:00
Dianne Hackborn
a0c94d333c am 3c78702d: Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev
* commit '3c78702db58af95b71b87c356f8fb0f95f3b70a7':
  Maybe fix issue #7146119: exception in FragmentManager
2012-09-12 17:10:39 -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
Chet Haase
4dd1768643 end() a reverse()'d animation correctly
Previously, an animator that had been reverse()'d (and was thus
playing backwards) would not end() at the right value. That is, a call
to end() would cause the animation to snap to its original end value, not
the reverse-playing end value (i.e., its start value). Logic to handle
calculating the proper end value was not taking the reversing behavior
into account.

Issue #6583656 When you call end() after calling reverse() on an animation that has not started leads to forward animation finishing.

Change-Id: Ifca60a32d4973c21b85aed9c459f802526c0207e
2012-09-12 16:33:26 -07:00
Fabrice Di Meglio
61a21770b7 Fix Javadoc spelling
Change-Id: I93685d3d092ce5e16bfa0e65e11d85ae030f3f29
2012-09-12 16:33:13 -07:00
Makoto Onuki
c3331e4168 am b11b9fc9: Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev
* commit 'b11b9fc9972ba0ae7f3d13984c5c61a8d89ca142':
  A new broadcast action which is sent when profile changes
2012-09-12 16:14:01 -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
Selim Gurun
0da798d458 am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev
* commit 'f4fd2eb5ee425a29aa2bed4c92ea21ac5fd7fd69':
  Minor update to addjavascriptinterface documentation
2012-09-12 13:42:59 -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
466b7a7c87 am 2cd35662: Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev
* commit '2cd35662caa824846555a3be595b7fa69337fa31':
  Fix SeekBar when in RTL layout direction
2012-09-12 13:29:58 -07:00
Fabrice Di Meglio
3736c23a67 am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev
* commit '8872465709d336083a908cb79d08661c6658265b':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
2012-09-12 13:29:53 -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
8389991f90 am b9674640: Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev
* commit 'b967464049d7a75face9237a89903342c4724f8a':
  Enforce encapsulation for MarginLayoutParams startMargin and endMargin
2012-09-12 13:26:40 -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
Selim Gurun
b92d26f307 am 4f8da32f: Merge "Make JavascriptInterface annotation public." into jb-mr1-dev
* commit '4f8da32ffaf7aaf1f670e74caa7cd8a70ddb63c6':
  Make JavascriptInterface annotation public.
2012-09-12 12:51:02 -07:00
Selim Gurun
4f8da32ffa Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 2012-09-12 12:48:32 -07:00
Brian Carlstrom
55bf4c1406 am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev
* commit '743115ffcd5f7b04d8b485bbfc5440216c3aaf4f':
  Tracking upgrade to bouncycastle 1.47
2012-09-12 11:24:11 -07:00
Brian Carlstrom
0efca17105 Tracking upgrade to bouncycastle 1.47
Change-Id: I4a3c508c5e65dd46a2df22935b5351092550fad5
2012-09-12 10:01:00 -07:00
Kristian Monsen
e6b2a85ae0 am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev
* commit 'bd0fe8783407bc760b8e9a9952cb96a600d26ea9':
  Deprecating methods (and a constant) for JB MR1
2012-09-12 09:36:51 -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
db2cc50b45 am 8b29d63d: Merge "Include user identifier in external storage paths." into jb-mr1-dev
* commit '8b29d63d0857337057db707549ef1faed39792fd':
  Include user identifier in external storage paths.
2012-09-11 23:38:38 -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
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
c010caef04 am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
* commit '0bb4d078afeadf4996240d0ac41514c28e5f795a':
  Screen magnifier should handle window rebuilds correctly.
2012-09-11 15:54:50 -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
4a7e0fc604 am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
* commit '99c0cb3b9d9fe187879ed1e03a8cc850f1906cc9':
  Set up default (random) Android IDs for all users
2012-09-11 15:23:16 -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