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

4016 Commits

Author SHA1 Message Date
Dianne Hackborn
b51e5bd666 am ecc42f8b: am 4ca17df3: Fix build. 
* commit 'ecc42f8bdcd7279c6804bda3b4feeaea51019d48':
  Fix build.
 2012-06-06 15:15:24 -07:00
Dianne Hackborn
4ca17df380 Fix build. 
Change-Id: I42c3f6466d926258bbd303f2082de7207734451a
 2012-06-06 15:02:25 -07:00
Dianne Hackborn
20e14948f2 am 82811d45: am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 
* commit '82811d45ed21ccdff77d11495fa2045c7942bd6d':
  Docs (mostly): enumerate JELLY_BEAN target SDK changes.
 2012-06-06 13:37:57 -07:00
Dianne Hackborn
533fce25a2 Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 2012-06-06 13:31:59 -07:00
Dianne Hackborn
636fd528f7 Docs (mostly): enumerate JELLY_BEAN target SDK changes. 
Okay this isn't entirely docs.  I have un-hidden the new permission
for binding to accessibility services; we were going to go out with
it hidden since it didn't go into factory ROM, but now that we are
doing other things we might as well expose it.

Also changed a log from E to W, since it is not an error.

Change-Id: I9226c95e3b63e12218fe41dc3f4290d9824a9e5c
 2012-06-06 11:36:49 -07:00
Adam Powell
b85afc25d5 resolved conflicts for merge of 1178569b to master 
Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
 2012-06-05 20:08:41 -07:00
Adam Powell
690ffb4e1f More fun with MediaRouter 
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.

Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.

Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
 2012-06-05 19:15:57 -07:00
Fabrice Di Meglio
0cd655ad2d Merge "Revert "Revert "Clean up layout direction APIs for Drawable""" 2012-06-04 16:29:05 -07:00
Fabrice Di Meglio
c8e46199de Make 16.txt identical to the one from Jellybean 
Change-Id: I46f48022e27b0a6339efcee73f50014adfeaf924
 2012-06-04 15:23:32 -07:00
Fabrice Di Meglio
b03b434089 Revert "Revert "Clean up layout direction APIs for Drawable"" 
This reverts commit c96132ff53e5c26f5b0170edd85072006fb2bc70
 2012-06-04 12:55:30 -07:00
Dianne Hackborn
87553a4743 am 524d8ee8: am 433927c5: Fix build. 
* commit '524d8ee8e0fd8d8be8273a5b59886371d6fa77b8':
  Fix build.
 2012-06-04 12:40:48 -07:00
Dianne Hackborn
433927c52f Fix build. 
Change-Id: Iccffe6dde6b96eaab4800e0bb0a9d46f740d686a
 2012-06-04 12:14:21 -07:00
Daniel Sandler
a9a6ef6aee am e3e7b65d: am f756e495: Fix build break. 
* commit 'e3e7b65dfd3834263e03312e515f522254b9f799':
  Fix build break.
 2012-06-04 12:01:26 -07:00
Daniel Sandler
f756e495d5 Fix build break. 
Change-Id: I3ce946740e0de0850f17c05b6701a7b070bfe8c9
 2012-06-04 14:36:25 -04:00
Adam Powell
a55a94bfb3 am 58e29c06: am 7c86958d: Merge "Add MediaRouter API." into jb-dev 
* commit '58e29c06610054419339bb0a75c44ab30d6fe89a':
  Add MediaRouter API.
 2012-06-03 14:19:07 -07:00
Adrian Ludwig
8100eaa59d am d966c19c: am 4bc97b54: Fix build. 
* commit 'd966c19c090d696363daac73c3cb092340f7c8c9':
  Fix build.
 2012-06-02 08:21:12 -07:00
Dianne Hackborn
cbc5e0aae4 am 3522225d: am ea01e4a2: Merge "Survey says: NIET!" into jb-dev 
* commit '3522225dba19e77defaf56f0e70c0382c2cbb0a2':
  Survey says: NIET!
 2012-06-02 08:20:36 -07:00
Jean-Baptiste Queru
c96132ff53 Revert "Clean up layout direction APIs for Drawable" 
This reverts commit c1da65187a4b9de8f72bd617ef937030187c0a92.
 2012-06-02 05:46:20 -07:00
Adam Powell
9a1de308ce Add MediaRouter API. 
This is just the initial state tracking. Still to go is
actually triggering Bluetooth A2DP correctly and tracking
process state in the system server.

Change-Id: I33031d52799d6e2d7208910da833831085cc3677
 2012-06-01 18:19:20 -07:00
Adrian Ludwig
4bc97b54f4 Fix build. 
Change-Id: I739102258739ceb9856b8867949fa7f53532189d
 2012-06-01 16:03:04 -07:00
Dianne Hackborn
4034bc431d Survey says: NIET! 
Bug: 6593206
Change-Id: I5390609a5615d6aff1793a9bc361012a0cea330b
 2012-06-01 13:38:48 -07:00
Fabrice Di Meglio
7806882541 Merge "Clean up layout direction APIs for Drawable" 2012-06-01 11:41:58 -07:00
Fabrice Di Meglio
c1da65187a Clean up layout direction APIs for Drawable 
- see bug #6427629

Change-Id: I3119db3022bba0ee325b6d0d4471bfebd850ec10
 2012-06-01 11:39:10 -07:00
Philip Milne
0597161ee4 Merge "Fix for bug 6050753." 2012-05-31 10:30:09 -07:00
Ben Murdoch
1bd37b176e Deprecate WebChromeClient.onJsTimeout 
This method was only supported with the JSC JavaScript engine.
V8 became the default JavaScript engine in Froyo and this method
has not been invoked since. Support for building JSC was removed
in b/5495373.

Bug: 6295376
Change-Id: I3dbe83f375b88ebbbb713d3c3fa5a2fa323a0d45
 2012-05-28 14:20:07 +01:00
Jean-Michel Trivi
3266873f7f am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev 
* commit 'b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9':
  Unhide KeyguardManager locked and secure state getters
 2012-05-24 18:34:07 -07:00
Jean-Michel Trivi
37fde0aca0 Unhide KeyguardManager locked and secure state getters 
Unhide the following methods:
  android.app.KeyguardManager.isKeyguardLocked()
  android.app.KeyguardManager.isKeyguardSecure()

Fix some javadoc typos

Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
 2012-05-24 18:09:44 -07:00
Jeff Brown
0c1e7d339c am 4535899b: am 1957fd27: Merge "Add public API to Choreographer." into jb-dev 
* commit '4535899b9cf07fdf1063848bdd8caaabe36b3cd5':
  Add public API to Choreographer.
 2012-05-21 18:39:29 -07:00
Jeff Brown
1957fd271f Merge "Add public API to Choreographer." into jb-dev 2012-05-21 18:32:26 -07:00
Jeff Brown
cae804901e Add public API to Choreographer. 
The API allows applications to post FrameCallbacks that will
run on vsync and that are provided with the frame time.

Change-Id: Ieb39fcdd085ef8a57805b8f78e7a307f416ff21d
 2012-05-21 18:15:29 -07:00
Romain Guy
abafe372ee am 6fa51de8: am 46a8b1ac: Merge "Remove unused, obsolete debug code" into jb-dev 
* commit '6fa51de80bae65a93346ed18628010a0867607cc':
  Remove unused, obsolete debug code
 2012-05-21 14:32:43 -07:00
Romain Guy
fc0c048ef4 am c301e78c: am 9579bf82: Merge "Gallery, we need to talk..." into jb-dev 
* commit 'c301e78c78188803137e2b9abfa27cd0f1ffaff5':
  Gallery, we need to talk...
 2012-05-21 14:27:40 -07:00
Romain Guy
13b907353f Remove unused, obsolete debug code 
All these features have either been abandonned and left un-maintained
for years or can be replaced by systrace.

Change-Id: I42e4579a8078744047e5fe08a7a15254970b09bc
 2012-05-21 13:29:06 -07:00
Dianne Hackborn
bad4c4bf71 am ccf4e2f7: am abe39277: Merge "Fix issue #6515427: Add android.hardware.television and fix..." into jb-dev 
* commit 'ccf4e2f71b65ace6d55c1e8513dd60b1123805da':
  Fix issue #6515427: Add android.hardware.television and fix...
 2012-05-21 12:43:35 -07:00
Jean-Michel Trivi
33cc232f74 am e215af22: am c79a9eac: Merge "New action and extra in RecognizerIntent for "hands free" voice search" into jb-dev 
* commit 'e215af22bfbb1f1322be07f43f03183daca21e93':
  New action and extra in RecognizerIntent for "hands free" voice search
 2012-05-21 12:42:46 -07:00
Dianne Hackborn
35013d0e8b Merge "DO NOT MERGE: Remove a few left-over layout direction things." into jb-dev 2012-05-18 18:04:11 -07:00
Dianne Hackborn
39af624f31 DO NOT MERGE: Remove a few left-over layout direction things. 
Change-Id: Id66b171594af939df4716aa0e0baa25fe47eecee
 2012-05-18 17:34:06 -07:00
Romain Guy
5a418c771d Gallery, we need to talk... 
Change-Id: Ie4b62df03c27161565d303d11447e3d7ff3115c4
 2012-05-18 17:09:53 -07:00
Dianne Hackborn
abe3927701 Merge "Fix issue #6515427: Add android.hardware.television and fix..." into jb-dev 2012-05-17 18:18:27 -07:00
Dianne Hackborn
0cf2c8a533 Fix issue #6515427: Add android.hardware.television and fix... 
...logic for notouch in Configuration

Added new TELEVISION feature.

We now force the configuration to "television" if the TELEVISION
feature is set, and "notouch" if the TOUCHSCREEN feature is not set.

Also cleaned up documentation, deprecated some configurations that
are not used.

Change-Id: If1c7a284b580a8a66bda2a75f0c7fa841b3dc9b7
 2012-05-17 18:11:14 -07:00
Jean-Michel Trivi
482c9bb390 New action and extra in RecognizerIntent for "hands free" voice search 
New action and extra for android.speech.RecognizerIntent:
  ACTION_VOICE_SEARCH_HANDS_FREE
  EXTRA_SECURE

Change-Id: I1f390ede4f4087bae1781347bb211dc0a093e857
 2012-05-17 15:43:40 -07:00
Dianne Hackborn
7ba90544d9 am a15ebaa2: am 79f5777d: Merge "A few odds and ends." into jb-dev 
* commit 'a15ebaa25c93c750c22e80498c2415b2af0f2f3e':
  A few odds and ends.
 2012-05-15 18:20:45 -07:00
Dianne Hackborn
e302a16235 A few odds and ends. 
- Add documentation on "television" UI mode.
- Tweak new documentation and implementation around propagating
  URI grants through choosers.
- Add new activity launch flag for closing system dialogs.

Change-Id: I978c05f0dc3d16e1c55d43631828b9efa6335b19
 2012-05-15 14:58:32 -07:00
Jeff Brown
179817387b am f4df93ce: am 2f095760: Rename kcm attribute to keyboardLayout. 
* commit 'f4df93cec62861e3f185979612360c27dd80e043':
  Rename kcm attribute to keyboardLayout.
 2012-05-14 07:47:52 -07:00
Jeff Brown
2f09576074 Rename kcm attribute to keyboardLayout. 
Bug: 6478076
Change-Id: I7fc0d8eb36d03a628d070f8fd6ea1e1464b1a163
 2012-05-11 12:32:56 -07:00
Raph Levien
2ab6568046 resolved conflicts for merge of a9cc30ce to master 
Change-Id: I507bd7a4650f9a7bfe6a0ad7bb8dd4067adb6a8b
 2012-05-11 10:43:39 -07:00
Raph Levien
75ef98f821 Merge "Add fontFamily XML attribute to select font family by string" into jb-dev 2012-05-11 09:31:22 -07:00
Dianne Hackborn
0ecbdb3c16 resolved conflicts for merge of ef9876a6 to master 
Change-Id: Ib047baa2f6746f2a069ce9ff1be2d71c450a0932
 2012-05-10 23:10:32 -07:00
Dianne Hackborn
fa61f0b2e2 JellyBean is now 4.1. 
Change-Id: Ie37a7c4356d593010686d5dc7d6e715d30099e1e
 2012-05-10 19:02:19 -07:00
Dianne Hackborn
5c2a9ddcf2 am 00389a51: am b1b55e6c: Fix build. 
* commit '00389a5198d17a650b00b981b5a9174dbb88fc9f':
  Fix build.
 2012-05-10 16:34:33 -07:00