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

1684 Commits

Author SHA1 Message Date
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
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
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
Daniel Sandler
0887711d0f Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 2012-09-21 07:30:43 -07:00
Florian Uunk
b1ac72b54b Add intents to open text and video from search. 
We're adding support for searching for text (books, magazines) and video
(tv, movies).

Bug: 7208141
Change-Id: I19dd2f745518a96b22b02a29c1ab9a89d53cc0cc
 2012-09-21 15:15:04 +01:00
Wu-cheng Li
edc1a2bbc5 Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE 
bug:7141738
Change-Id: If0109671a072e978501e238fe3d7554693a92157
 2012-09-21 19:04:24 +08:00
Jim Miller
e5de9919b4 Fix the build. 
Change-Id: I80e2c915ba4c10dcb53b6a21152dc787e16d9e8f
 2012-09-20 21:57:46 -07:00
Dan Morrill
e4ab16ad98 New method returning user metadata. 
Change-Id: Ic1a42cf54152fe2e6bcd01b1bd9f1edb77d1710e
 2012-09-20 20:25:55 -07:00
John Reck
e6ff47840f Merge "Use less static synchronized" into jb-mr1-dev 2012-09-20 16:55:40 -07:00
John Reck
9f9d34552f Use less static synchronized 
Bug: 6482144

Change-Id: I86161e3298101c10a112add406615001561e649e
 2012-09-20 15:25:16 -07:00
Alon Albert
0a9a219c96 Add columns to CalendarContract 
isPrimary to Calendars
        /**
         * Is this the primary calendar for this account. If this column is not explicitly set, the
         * provider will return 1 if {@link Calendars#ACCOUNT_NAME} is equal to
         * {@link Calendars#OWNER_ACCOUNT}.
         */

isOrganizer to Events
        /**
         * Are we the organizer of this event. If this column is not explicitly set, the provider
         * will return 1 if {@link #ORGANIZER} is equal to {@link Calendars#OWNER_ACCOUNT}.
         * Column name.
         * <P>Type: STRING</P>
         */

Bug: 6888477
Change-Id: Ibc2b3903bc4a18fc1f0d52c1f8c897e2bac0c0d4
 2012-09-20 15:21:11 -07:00
Eric Laurent
c08870e946 am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit 'f9fac2c5fe3f304ee866b1afc3191d36835e96bd':
  Add multi user volume management
 2012-09-20 12:51:05 -07:00
Glenn Kasten
d86077c379 Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-20 12:45:45 -07:00
Glenn Kasten
62796aac59 Expose android.media.AudioManager.getProperty() 
Also fix minor documentation errors.

Bug: 6635041
Change-Id: I6bbbf1b7c5ab705ac374436ea0c098cb3c27fd4a
 2012-09-20 12:28:20 -07:00
Eric Laurent
f9fac2c5fe Merge "Add multi user volume management" into jb-mr1-dev 2012-09-20 11:18:17 -07:00
John Spurlock
5d514eb468 am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev 
* commit 'e0de5bfff2e74ee566ac2d053052de09aa25e54b':
  Fire "dreaming started" and "dreaming stopped" broadcasts.
 2012-09-20 06:24:20 -07:00