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

28758 Commits

Author SHA1 Message Date
Eric Laurent
c99a1107c0 Merge "add settings for dock audio enabled" into jb-mr1-dev 2012-10-27 14:42:18 -07:00
John Spurlock
5f050e5c2c Use settings to persist sticky widget. 
Addressing some comments:
 - Sticky widget is now saved in a user-scoped setting.
 - Removed multi-user widget from computation (obsolete).
 - Removed status widget from computation (just use right-most).
 - Removed duplicate isMusicPlaying logic.

(frameworks/base)

Change-Id: I8ef8f826677d78ac24da52adf2d99d47c8d965ac
 2012-10-27 10:55:09 -04:00
Chris Wren
1d269e8e8f Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev 2012-10-26 21:50:34 -07:00
Eric Laurent
7ee1e4ff73 add settings for dock audio enabled 
Add settings dock_audio_media_enabled indicating if dock audio
is enabled for media for docks that do not implement jack detection.

Bug 7302106.

Change-Id: I75766b606ceb870b3f89979c4e3cca88ed197aaf
 2012-10-26 18:11:21 -07:00
Fabrice Di Meglio
68b14054b9 Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev 2012-10-26 18:01:55 -07:00
Fabrice Di Meglio
bb4b601673 Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" 
This reverts commit 6bf6eb7d5f.
and also fbc21e126f

I have also removed all unnecessary calls to resolveLayoutDirection(int). This is possible as
we are resolving layout params on every child of a ViewGroup as of commit
fcc3348f61

Change-Id: I262a375b03fcc3c9261cbe2edebb6ec42ec2e186
 2012-10-26 17:13:33 -07:00
Michael Jurka
a15eeacff9 Merge "Fix bug where it wasn't possible to add widgets" into jb-mr1-lockscreen-dev 2012-10-26 16:10:25 -07:00
Michael Jurka
229dd8b355 Fix bug where it wasn't possible to add widgets 
- Happened when you were down to 0 widgets (which
won't be possible in future, but fixing this as
well)
 2012-10-26 16:06:12 -07:00
Fabrice Di Meglio
b8a220cbef am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 
* commit '07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
 2012-10-26 15:31:43 -07:00
Jeff Brown
d3d523da9a am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
  Add MediaRouter API to get presentation display.
 2012-10-26 15:28:41 -07:00
Fabrice Di Meglio
07ce0ca265 Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 2012-10-26 15:18:30 -07:00
Chris Wren
f0ee5b8135 single unlock target with honycomb semantics 
Bug: 7411431
Change-Id: I27a86041c93369df2be2d53cb81c29658e70bcca
Proto-Id: I631fa48da4c67351366bcc1002a01dfa66a34d8c
 2012-10-26 18:00:25 -04:00
Jeff Brown
4e0bf7c486 Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 2012-10-26 13:52:03 -07:00
John Spurlock
358148e386 Implement "sticky" widget logic. 
(frameworks/base)
Used after screen-off, and after launching camera.

Bug: 7418847
Change-Id: I5179e6af13be4494fde77fde2cdb5610ab888dac
 2012-10-26 15:58:13 -04:00
Fabrice Di Meglio
1957d281ea Fix bug #7419054 TextView Drawables resolution is broken in RTL mode 
- check layout direction previous value in the onResolveDrawables(int) callback
- dont do any Drawables resolution if we cannot resolve the layout direction
- also remove unnecessary call to resolveRtlPropertiesIfNeeded() in ViewGroup when
  adding a child as the call to resolveRtlPropertiesIfNeeded() will be done into
  the measure() call itself later

Change-Id: I62237af3d307dfea203f7f2865551d1c61a0e0b8
 2012-10-26 10:55:02 -07:00
Jeff Brown
92130f6407 Add MediaRouter API to get presentation display. 
This new API makes it possible for an application to ask on
which Display it should show a Presentation based on the currently
selected media route.

Also added a new API on DisplayManager to query displays that
support a certain category of uses.

Improved the documentation of the Presentation class to explain
how to choose an appropriate Display for presentation.

Bug: 7409073
Change-Id: Iab451215e570ae55f3718fc228303143c800fe51
 2012-10-25 20:31:21 -07:00
Michael Jurka
1254f2f42f Persist reordering/deleting widgets on keyguard 
Also, clean up warnings from unused imports

Change-Id: Id0ef12a584ffdaa8a4fb64ffe93d0dda0af398ec
 2012-10-25 16:43:10 -07:00
Justin Koh
37ae558676 Expose PreferenceManager constructor / Preference#performClick 
Expose PreferenceManager constructor and Preference#performClick so they can be
used by other UIs beyond the standard PreferenceActivity. Marked @hide so public
API is not affected.

Change-Id: Ieb4aecba5f86e40ff70f2b252458602e6b9ad1ee
 2012-10-25 16:27:43 -07:00
Fabrice Di Meglio
654761a059 am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev 
* commit '3e297339f8b77d54f520d5471c90c9d04e78400e':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
 2012-10-25 11:45:06 -07:00
Fabrice Di Meglio
fc53e584d3 Fix typos in LinearLayout comments 
- woow those were very old ones!

Change-Id: I72bf71d5c5aa14f32401aed04462d562672016f8
 2012-10-25 11:45:04 -07:00
Fabrice Di Meglio
3b53061e6d am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev 
* commit '3e297339f8b77d54f520d5471c90c9d04e78400e':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
 2012-10-25 11:44:47 -07:00
Fabrice Di Meglio
3e297339f8 Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev 2012-10-25 11:41:20 -07:00
Fabrice Di Meglio
72898e9828 FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants 
- made them private and final
- fixed comment

Change-Id: Ia1d22329edb7ac26e7bcd0489770a99ad41c4f0e
 2012-10-25 11:22:39 -07:00
Michael Jurka
8b3dd40019 Fix build 2012-10-24 18:45:10 -07:00
Michael Jurka
147dfc8642 Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev 2012-10-24 18:28:21 -07:00
Dianne Hackborn
72d0a5aa04 am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit 'ead7d90e8b049c9689560015dbb761242fd86c99':
  Fix issue #7408647: Add getUserCount() API
 2012-10-24 18:02:05 -07:00
Dianne Hackborn
db3efba6fc am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit 'ead7d90e8b049c9689560015dbb761242fd86c99':
  Fix issue #7408647: Add getUserCount() API
 2012-10-24 18:02:05 -07:00
Dianne Hackborn
ead7d90e8b Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 2012-10-24 17:58:13 -07:00
Michael Jurka
aa2859ae61 Adding ability to add multiple widgets to keyguard 
Bug: 7381803
 2012-10-24 17:41:34 -07:00
Dianne Hackborn
b26306ad52 Fix issue #7408647: Add getUserCount() API 
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
 2012-10-24 15:28:03 -07:00
Romain Guy
4344f20959 am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev 
* commit '9933331506c91e535ba277bef9c44e1852ccf16c':
  Ensure we have a GL context before deleting View layers Bug #7391098
 2012-10-24 13:53:46 -07:00
Romain Guy
ee0f615ffd am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev 
* commit '9933331506c91e535ba277bef9c44e1852ccf16c':
  Ensure we have a GL context before deleting View layers Bug #7391098
 2012-10-24 13:53:43 -07:00
Romain Guy
9933331506 Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev 2012-10-24 13:50:45 -07:00
Jeff Brown
b43269acdd am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
  Secure windows, secure surface views and secure displays.
 2012-10-24 12:17:16 -07:00
Jeff Brown
d9fb5848c8 am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
  Secure windows, secure surface views and secure displays.
 2012-10-24 12:17:04 -07:00
Jeff Brown
1202c43685 Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 2012-10-24 12:14:08 -07:00
Zhihai Xu
11181c7ae6 am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit '8e080d7e10dd17662750605538a9799af66494e9':
  License of files Bluetooth package is not updated to ASL2
 2012-10-24 11:01:15 -07:00
Zhihai Xu
a656971e73 am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit '8e080d7e10dd17662750605538a9799af66494e9':
  License of files Bluetooth package is not updated to ASL2
 2012-10-24 10:48:01 -07:00
Zhihai Xu
8e080d7e10 Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 2012-10-24 10:44:16 -07:00
Adam Powell
848a5557db Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev 2012-10-23 21:54:42 -07:00
Jeff Brown
f0681b34df Secure windows, secure surface views and secure displays. 
Add new API to determine whether a display is secure.
Add new API to make a SurfaceView secure.
Clarify documentation.

Bug: 7368436
Change-Id: I7068c34c910e43b4bc72e43fa0dded59a25f0fe2
 2012-10-23 20:37:40 -07:00
Romain Guy
bd17bd3431 Ensure we have a GL context before deleting View layers 
Bug #7391098

The existing code was doing a make current to guarantee we have a
current context. This can however fail when the surface is destroyed
which could lead to GL calls without an EGL context, and therefore
potential leaks. This change fixes the issue by using a technique
found in HardwareRenderer.destroyHardwareResources(). If the surface
is not available then we use a special 1x1 pbuffer as a way to get
a valid context.

Change-Id: I716d3799bf90120d793d76e90a83956837ecd491
 2012-10-23 19:17:15 -07:00
Zhihai Xu
fa0fd39a4b License of files Bluetooth package is not updated to ASL2 
bug 7385618

Change-Id: I6232f537f4fda979d3aabe3a059c11d3299de9b8
 2012-10-23 17:31:56 -07:00
Craig Mautner
9e96c69e3e am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 
* commit '6757572b39d3802c4d7b69467b5ebf69a96c208b':
  Add throwing InvalidDisplayException from addView.
 2012-10-23 16:57:11 -07:00
Craig Mautner
6757572b39 Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 2012-10-23 16:53:32 -07:00
Adam Powell
962159addd Fix up GlowPadView attributes 
Change-Id: I98c14177753e713fcdaaf886c44ce10ab49eebc9
 2012-10-23 16:09:40 -07:00
Chet Haase
f5fa64f24b am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev 
* commit 'fbba753f62f13a12d9287c67921d1ea60e92768d':
  Handle offscreen animations correctly
 2012-10-23 15:48:40 -07:00
Chet Haase
fbba753f62 Merge "Handle offscreen animations correctly" into jb-mr1-dev 2012-10-23 15:46:04 -07:00
Romain Guy
9389d447c1 am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev 
* commit 'b75ade9cce02dffb967ff4719381254585074c58':
  Use existing display list to render the resize buffer Bug #7400903
 2012-10-23 15:44:26 -07:00
Romain Guy
b75ade9cce Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev 2012-10-23 15:41:42 -07:00