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

4826 Commits

Author SHA1 Message Date
Wu-cheng Li
4358c93892 am 29f5230d: Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev 
* commit '29f5230dc604537a72842a70991bae71019f8c80':
  Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
 2012-09-24 08:46:34 -07:00
Adam Cohen
c328f7f8f6 am dce17917: am 8562cb59: Merge "Changing public method to @hide, doesn\'t have to be public" into jb-mr1-dev 
* commit 'dce17917103d25e18063a7d71e592e131f8e0bd3':
  Changing public method to @hide, doesn't have to be public
 2012-09-24 00:52:02 -07:00
Jason Sams
ebe3bc596b am 260b7214: am 7b3132d9: Merge "Add Blend intrinsic." into jb-mr1-dev 
* commit '260b72148e037c63b2c3984e6adf6aab052c2394':
  Add Blend intrinsic.
 2012-09-24 00:51:41 -07:00
Eino-Ville Talvala
5d0c5079ce am eace371e: am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev 
* commit 'eace371ee01f8e61731d86110ec84258994eeded':
  NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
 2012-09-24 00:51:20 -07:00
Jim Miller
0b0c0efabf am 998f94c9: am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev 
* commit '998f94c96afee8d3c76dcaf64f3f23dfdf8d8ce5':
  Make DPM API for disabling keyguard widgets more generic
 2012-09-24 00:50:28 -07:00
John Spurlock
37a16ee466 am b8016f7a: am 22505501: Merge "Additions to Dream public api." into jb-mr1-dev 
* commit 'b8016f7acecf8ff43b98c0285c7d9910577934aa':
  Additions to Dream public api.
 2012-09-24 00:48:48 -07:00
Fabrice Di Meglio
f7a3e979a7 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 16:45:51 -07:00
Fabrice Di Meglio
1a7d487380 Fix bug #6427629 Clean up layout direction APIs 
- rename getResolvedTextAlignment() to getTextAlignment()

Change-Id: I6a2b6c9ec4f5cea1adde46e35d5f3c49880791ee
 2012-09-23 16:19:58 -07:00
Fabrice Di Meglio
be4c5dd9d0 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 16:19:03 -07:00
Fabrice Di Meglio
97e146cf02 Fix bug #6427629 Clean up layout direction APIs 
- rename getResolvedTextDirection() to getTextDirection()

Change-Id: Id2a6025daf5521dcd676e454fc6bb9955fdccf2d
 2012-09-23 15:55:11 -07:00
Wink Saville
8a06969d5b Merge "Refactor Cell Location public API." into jb-mr1-dev 2012-09-23 15:44:30 -07:00
Fabrice Di Meglio
239e430578 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 15:09:56 -07:00
Fabrice Di Meglio
e3f2ac9e52 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 15:05:56 -07:00
Fabrice Di Meglio
e56ffdc7b3 Fix bug #6427629 Clean up layout direction APIs 
- rename getResolvedLayoutDirection() to getLayoutDirection()

Change-Id: I3afe56c0db0751952f5056c23893cb7455531d29
 2012-09-23 14:51:16 -07:00
Fabrice Di Meglio
4457e85a70 Fix bug #6427629 Clean up layout direction APIs 
- canResolveXxx() should be hidden
- resetResolvedXxx() should be hidden
- resolveDrawables(), resolveLayoutDirection(), resolvePadding(), resolveTextAlignment(), resolveTextDirection() should be hidden
- onResolvedXxx() should be merged into one callback
- fix also an issue with setting the layout direction of the drawable in ImageView
- fix also an issue with checking if TextAlignment can be resolved

Change-Id: I1402269ddf8632525f5550f80e5610e1a7b4034d
 2012-09-23 14:15:26 -07:00
Dianne Hackborn
b939e35274 Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 2012-09-23 12:58:10 -07:00
Dianne Hackborn
8da429e80d Fix issue #7209355, #7214271. 
Issue #7209355: Intent on the secondary user results in an intent picker
in the Primary user.
Issue #7214271: Crash in system UI

Also fix a bug where I recently broke the removeTask() operation in the
activity manager where it would remove the wrong task.

Change-Id: I448c73a0e83a78d9d8d96b4629658c169888d275
 2012-09-23 12:53:34 -07:00
Eino-Ville Talvala
a91c9f9f7a Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 2012-09-23 10:14:22 -07:00
Wu-cheng Li
29f5230dc6 Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev 2012-09-23 02:21:17 -07:00
Adam Cohen
24694468d8 am 8562cb59: Merge "Changing public method to @hide, doesn\'t have to be public" into jb-mr1-dev 
* commit '8562cb59825a9ccff2b019d2c30f38c8798ca3a1':
  Changing public method to @hide, doesn't have to be public
 2012-09-21 17:50:31 -07:00
Jason Sams
f68920464a am 7b3132d9: Merge "Add Blend intrinsic." into jb-mr1-dev 
* commit '7b3132d97a2a28093f139dc884cb4d43de65af50':
  Add Blend intrinsic.
 2012-09-21 17:50:11 -07:00
Eino-Ville Talvala
09a792c7fd am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev 
* commit '5ce25d717059c9c37618aa349314077f99ac34c7':
  NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
 2012-09-21 17:49:51 -07:00
Jim Miller
f084208bdf am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev 
* commit '1ed9fa10de3e94678ddb2929936caa3ff4164cf8':
  Make DPM API for disabling keyguard widgets more generic
 2012-09-21 17:49:00 -07:00
John Spurlock
7492091128 am 22505501: Merge "Additions to Dream public api." into jb-mr1-dev 
* commit '2250550187ed7a2bd98d5f861151b49db5635f6e':
  Additions to Dream public api.
 2012-09-21 17:47:36 -07:00
Romain Guy
a132665291 am 4187f928: Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev 
* commit '4187f928921bab6a77e8b6592131f2a2b02ac0a3':
  API REVIEW: Undeprecate Location.dump() Bug #7173109
 2012-09-21 17:47:24 -07:00
Bjorn Bringert
3661ee1e8b am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev 
* commit '45b07b9427cc736bf4fd5658ef2f30884ba4d9a4':
  Add intents to open text and video from search.
 2012-09-21 17:46:43 -07:00
Dan Morrill
26cee9f355 am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev 
* commit '466bd636812684aeb8161f144597cc3b3ed39078':
  New method returning user metadata.
 2012-09-21 17:46:29 -07:00
Daniel Sandler
faded6e63b am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 
* commit '0887711d0f76d858501fd017259ddfdc1950eb3f':
  Add Notification.Builder.setShowWhen(boolean).
 2012-09-21 17:45:35 -07:00
Jim Miller
eea4be2743 am 3e87eafc: Merge "Fix the build." into jb-mr1-dev 
* commit '3e87eafc7d1aef95801f1758bb78da8b2f960a75':
  Fix the build.
 2012-09-21 17:44:42 -07:00
Adam Cohen
8562cb5982 Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev 2012-09-21 16:56:31 -07:00
Adam Cohen
bd1e0076c6 Changing public method to @hide, doesn't have to be public 
Change-Id: I4c87b154fd99376a0337f9fc65024e13ddb74da5
 2012-09-21 16:51:50 -07:00
Jason Sams
7b3132d97a Merge "Add Blend intrinsic." into jb-mr1-dev 2012-09-21 16:24:07 -07:00
Jason Sams
f70bb04346 Add Blend intrinsic. 
Change-Id: I6f679c910fc23fe7441e17ad66bcf5f3dd7425a0
 2012-09-21 16:10:49 -07:00
Eino-Ville Talvala
5ce25d7170 Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev 2012-09-21 16:05:59 -07:00
Philip Milne
2f6d882952 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos() 
Change-Id: I71c24ea10093ece07a0780e97bc641ff548c1a44
 2012-09-21 15:54:41 -07:00
Jim Miller
1ed9fa10de Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev 2012-09-21 15:21:33 -07:00
Wink Saville
c6e4917add Refactor Cell Location public API. 
Bug: 7189651
Change-Id: I173412095a5f7ae6116ee65b5315782f1c0c7688
 2012-09-21 13:54:05 -07:00
Philip Milne
7b75781845 Bug #6110465. Optical bounds support for all ViewGroup subclasses. 
This CL generalizes the optical bounds support previously contained in the
GridLayout implementation and then incorporates the new form directly into
the base View and ViewGroup implementations. After this change, GridLayout is
returned to an 'optical bounds' unaware state, and all layouts (including non-platform
ones) inherit the ability to perform their layout operation by optical (rather than clip)
bounds using their existing implementations.

The "layoutMode" property of ViewGroup and its associated constants are
made public in this CL.

Change-Id: Ic1bba0e1c6fc14da4aeab0b28c975d562b5f82dd
 2012-09-21 13:48:40 -07:00
John Reck
cea904c91e am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev 
* commit 'e6ff47840fc6d8ac5ba551101684011e328b4caa':
  Use less static synchronized
 2012-09-21 13:34:36 -07:00
Romain Guy
5172316cb2 am a1583288: am 4187f928: Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev 
* commit 'a1583288aa9e6b740d843b82ccdfd386c8f99455':
  API REVIEW: Undeprecate Location.dump() Bug #7173109
 2012-09-21 12:47:25 -07:00
Bjorn Bringert
5c28267461 am f9173428: am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev 
* commit 'f9173428688ce2b6192e72fd70d18ff74cbb34be':
  Add intents to open text and video from search.
 2012-09-21 12:46:50 -07:00
Dan Morrill
9589c79914 am 7c987ca4: am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev 
* commit '7c987ca47cf37af719d05b161e7b516c0dee8740':
  New method returning user metadata.
 2012-09-21 12:45:08 -07:00
Daniel Sandler
94b5cd9b37 am 89e27caa: am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 
* commit '89e27caa0cc4a488eaf202c2478204238f95fc0a':
  Add Notification.Builder.setShowWhen(boolean).
 2012-09-21 12:44:19 -07:00
John Spurlock
2250550187 Merge "Additions to Dream public api." into jb-mr1-dev 2012-09-21 12:28:35 -07:00
Romain Guy
4187f92892 Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev 2012-09-21 11:20:58 -07:00
Romain Guy
8a624ef0fe API REVIEW: Undeprecate Location.dump() 
Bug #7173109

Change-Id: Ia2f4a5b6255dae7ace4702f7d66ec30a077c9c79
 2012-09-21 11:20:00 -07:00
Glenn Kasten
43e5916e67 am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 
* commit 'd86077c3792ca03f004376d81e449a3ecdaa5e8b':
  Expose android.media.AudioManager.getProperty()
 2012-09-21 11:04:39 -07:00
Bjorn Bringert
45b07b9427 Merge "Add intents to open text and video from search." into jb-mr1-dev 2012-09-21 10:30:20 -07:00
Dan Morrill
466bd63681 Merge "New method returning user metadata." into jb-mr1-dev 2012-09-21 09:53:57 -07:00
John Spurlock
d5c582c494 Additions to Dream public api. 
- lightsOut() -> setLightsOut(boolean)
   (deprecated lightsOut, will remove once all baked-in dreams are updated)
 - Added ability to keep the screen bright (default = false).
 - Lights out is now true by default.
 - Consistent setters(setXxx) + getters(isXxx) for
   interactive, lightsOut, fullscreen, and screenBright dream attributes.
   Can set attributes at any time (even before window is created).
 - Fleshed out javadocs for public api.
 - Reordered things a bit.
 - Added example of manifest dream declaration ready for copypasta.
 - Removed unused action constant, added category constant.

Bug:7172816
Bug:7111868
Change-Id: I721db7a1a5e5ad047a3723b4d5141ef53b0970af
 2012-09-21 12:37:11 -04:00