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

4633 Commits

Author SHA1 Message Date
Romain Guy
331b552734 am aabe4bb4: am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 
* commit 'aabe4bb4776c21592db7e0714b3fec960b6778c7':
  A new clock widget to create lock screen appwidgets
 2012-11-01 11:45:40 -07:00
Romain Guy
aabe4bb477 am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 
* commit '9c0010f856d623845b20a7dd13c024023626623c':
  A new clock widget to create lock screen appwidgets
 2012-11-01 11:28:13 -07:00
Romain Guy
9c0010f856 am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 
* commit '998d03bd943053741bab17a8ef0abb355f6bc3ae':
  A new clock widget to create lock screen appwidgets
 2012-11-01 11:26:10 -07:00
Romain Guy
3d1728c03a A new clock widget to create lock screen appwidgets 
This new widget replaces DigitalClock. It listens to all the correct
system events and offer the ability to customize the formatting
patterns in 12-hour and 24-hour modes. It also supports fixed
time zones to create world clocks.

One more step towards becoming ClockOS!

Change-Id: I677e5dfca8cd8c8d1f8c49e54d7507f4d1885bf4
 2012-10-31 20:31:58 -07:00
Jeff Brown
266ca72300 am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '46a0ec73b6d4a81dd037d7beef7321f25349bf9c':
  Add MediaRouter API to get presentation display.
 2012-10-29 13:43:14 -07:00
Jeff Brown
46a0ec73b6 am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
  Add MediaRouter API to get presentation display.
 2012-10-29 13:37:10 -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
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
Fabrice Di Meglio
809312791c am 0182dc39: am 3b53061e: 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 '0182dc39bd969b797614c90e44978b83ac57fd1c':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
 2012-10-25 11:50:07 -07:00
Fabrice Di Meglio
0182dc39bd am 3b53061e: 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 '3b53061e6d2753440da04c042d26b8c4e94a5b95':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
 2012-10-25 11:47:08 -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
Dianne Hackborn
7a588e757a am a699c1b1: am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit 'a699c1b16f9732308a5c17260607db1b7690d394':
  Fix issue #7408647: Add getUserCount() API
 2012-10-24 18:07:17 -07:00
Dianne Hackborn
a699c1b16f am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit '72d0a5aa04f18af5037ff331c2f0983f7cbd4331':
  Fix issue #7408647: Add getUserCount() API
 2012-10-24 18:04:27 -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
b26306ad52 Fix issue #7408647: Add getUserCount() API 
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
 2012-10-24 15:28:03 -07:00
Jeff Brown
2af7e72229 am 5bac2df4: am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit '5bac2df4d69f096fa8c858bcb3713b7af9e977f8':
  Secure windows, secure surface views and secure displays.
 2012-10-24 12:22:01 -07:00
Jeff Brown
5bac2df4d6 am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit 'b43269acddb7061c43fa6ace6a896c51a9bf4dce':
  Secure windows, secure surface views and secure displays.
 2012-10-24 12:19:59 -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
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
Craig Mautner
990c1b7f3e am a170dcb7: am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 
* commit 'a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c':
  Add throwing InvalidDisplayException from addView.
 2012-10-23 17:04:22 -07:00
Craig Mautner
a170dcb7b6 am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 
* commit '9e96c69e3e9ebdb820acd347b4691c32a5d76be4':
  Add throwing InvalidDisplayException from addView.
 2012-10-23 17:01:20 -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
6018aeec27 Add throwing InvalidDisplayException from addView. 
Throw an InvalidDisplayException to addView if the display being
added to has been removed. Handle this exception in Dialog.show()
by removing the view after it has been added and rethrow the
exception from there.

Add javadoc to ViewManager.addView and Presentation.show explaining
the new exception and how best to handle it.

Bug: 7368565 partially fixed. It remains for the Videos app to
handle Presentation.show throwing the InvalidDisplayException.

Change-Id: Ib4303c9b3f7bf7a0cfa95d19bd60a0c128658c48
 2012-10-23 15:34:29 -07:00
Dave Burke
0b9b415632 am b1f434c1: am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit 'b1f434c16eefb028ef441ba40df8abe1e087a4eb':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:09:48 -07:00
Dave Burke
b1f434c16e am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit '744b4dca34e605b80e553a34327067abc862a320':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:07:52 -07:00
Dave Burke
744b4dca34 am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit '09a5321c60c02d944684abb98e0daec9dd810fab':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:05:29 -07:00
Dave Burke
09a5321c60 Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 2012-10-18 21:02:13 -07:00
Dave Burke
579e14016c Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" 
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
 2012-10-18 20:41:55 -07:00
Fabrice Di Meglio
c38684af87 am 4c2db5f2: am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '4c2db5f2a579132f6b6861c50d7ff99bb6c8035c':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:29:00 -07:00
Fabrice Di Meglio
4c2db5f2a5 am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '8de328c996a9f3a8f5ca3ea8e7c47421dd09b9aa':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:27:09 -07:00
Fabrice Di Meglio
8de328c996 am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:24:08 -07:00
Fabrice Di Meglio
1e0ed6b232 Fix missing @hide on ViewGroup.resolveLayoutParams() 
- as we dont need this to be public

Change-Id: Ib8de262eec26d4785b13875d59599369b06a067d
 2012-10-18 16:06:52 -07:00
Fabrice Di Meglio
5f9b095d4c am 2a902caa: am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-dev 
* commit '2a902caab23819591570deacc1741677f7b21118':
  Fix the build
 2012-10-18 15:46:02 -07:00
Fabrice Di Meglio
2a902caab2 am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-dev 
* commit '193229a52a732f537e1f062426d1cc8d774bd2c7':
  Fix the build
 2012-10-18 15:43:02 -07:00
Fabrice Di Meglio
193229a52a am 0437302f: Merge "Fix the build" into jb-mr1-dev 
* commit '0437302f164f3eb1ba6a359ef5b3cd857facbbe4':
  Fix the build
 2012-10-18 15:40:24 -07:00
Fabrice Di Meglio
3cb8d26bb0 Fix the build 
- was missing a "make update-api" pass

Change-Id: I004a1650cf7946e0e8bd36d75dab81bbca80443c
 2012-10-18 15:34:30 -07:00
Justin Ho
f114945269 am 22bd3726: am 76a01424: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '22bd3726be37a24e956d962d61657d8a3d54c985':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:06:15 -07:00
Justin Ho
5c555f39fb am 0efebf0a: am c35f7650: am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit '0efebf0af4c21b9d02c9c06b67867a554e0b35ea':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 16:03:29 -07:00
Justin Ho
22bd3726be am 76a01424: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '76a0142477e3ebda381d717572b21b355c172c26':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:03:11 -07:00
Justin Ho
76a0142477 am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '871a6d7d4fb3bffaff37e45f0b4f5e3c862239d2':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:00:37 -07:00
Justin Ho
0efebf0af4 am c35f7650: am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit 'c35f76508eed905e06954cf8955065909b2039a7':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 16:00:31 -07:00
Justin Ho
c35f76508e am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit '4db3165793a837ffc8197184fbc13ef2217e3dfc':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 15:58:52 -07:00
Justin Ho
871a6d7d4f Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 2012-10-17 15:55:15 -07:00
Justin Ho
4e360f0600 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." 
This reverts commit f49d835dfe1bd21920ff8a48cbdfb9c1fd632fd9

Change-Id: If0093f23d6458e53619220fbf0aa5f844ad2c790
 2012-10-17 15:54:20 -07:00
Justin Ho
4db3165793 Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 2012-10-17 15:53:02 -07:00
Justin Ho
f49d835dfe This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height. 
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I0fe25056cd54b8852b32ae4621e048d3f5c7d555
 2012-10-17 15:50:48 -07:00
Fabrice Di Meglio
7cfd0a2809 am 86a8b251: am d8989364: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit '86a8b25114fbc033c474a214699ad77a9140af5e':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:26:41 -07:00
Fabrice Di Meglio
86a8b25114 am d8989364: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit 'd89893642f81f854455da601e4735d226cf95214':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:23:55 -07:00