Dirk Dougherty
f1d7dc730f
am 7b9a2889: Doc change: fix some table formatting.
...
* commit '7b9a28892b1821a657bc9de5245528557d15a154':
Doc change: fix some table formatting.
2012-10-29 14:11:46 -07:00
Eric Laurent
67baf8781b
am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
...
* commit 'c99a1107c0d4fdf47595e5072192d647a01e13b3':
add settings for dock audio enabled
2012-10-29 14:02:31 -07:00
Fabrice Di Meglio
9d662c7765
am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev
...
* commit '68b14054b96571d4009c6c5a9b4c3413d908a523':
Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
2012-10-29 14:01:51 -07:00
Michael Jurka
18b5b1f462
am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev
...
* commit 'a15eeacff99650cb9151106438fb61b73d4e749a':
Fix bug where it wasn't possible to add widgets
2012-10-29 14:01:10 -07:00
John Spurlock
e25974c347
am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
...
* commit '011717d0648878eedec9e6de90b8fba12f550df7':
Implement "sticky" widget logic.
2012-10-29 14:00:48 -07:00
Fabrice Di Meglio
dd80335edd
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-29 13:55:46 -07:00
Justin Koh
56d9696bb7
Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
2012-10-29 13:33:01 -07:00
Jeff Brown
14012e1d1b
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-29 13:32:02 -07:00
Michael Jurka
b1c5ec176d
am 1254f2f4: Persist reordering/deleting widgets on keyguard
...
* commit '1254f2f42f7173ef51d0034975ab5cb7d44f8209':
Persist reordering/deleting widgets on keyguard
2012-10-29 13:31:27 -07:00
Michael Jurka
fc00e67cb0
am 8b3dd400: Fix build
...
* commit '8b3dd40019db2c5744b3adceb75a231311bc00b7':
Fix build
2012-10-29 13:30:20 -07:00
Michael Jurka
e88eebbb3b
am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
...
* commit '147dfc8642ecbdce527d18bdbeece7b7d05dc883':
Adding ability to add multiple widgets to keyguard
2012-10-29 13:30:16 -07:00
Adam Powell
7e83e33953
am 848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev
...
* commit '848a5557dba25defd5f332ebc20b61d0097f27f0':
Fix up GlowPadView attributes
2012-10-29 12:45:13 -07:00
Dirk Dougherty
7b9a28892b
Doc change: fix some table formatting.
...
Change-Id: I1533be695347697f5afd5c8d2719a0ff0b07abaa
2012-10-28 13:40:26 -07:00
Eric Laurent
c99a1107c0
Merge "add settings for dock audio enabled" into jb-mr1-dev
2012-10-27 14:42:18 -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
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
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