Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,114 Commits 3 Branches 0 Tags
153b4374d067ee92a0b9c712e54300cc49db017c
Commit Graph

9167 Commits

Author SHA1 Message Date
Robert Greenwalt
153b4374d0 Don't reset connections switching default->hipri 
A usecase is to use hipri to keep alive 3g connections when wifi
is about to be brought up.  They are the same network, so don't
do the reset unless both are down.

This will go away when we get the deferred network downing.

bug:2865630
Change-Id: I07729b7776fe5ea129120c688cf7839a55a7ed95
 2010-08-02 18:13:42 -07:00
Adam Powell
71cbae81b0 Merge "Fix bug 2859423 - action bar: need a way to choose item in spinner" 2010-07-21 14:35:41 -07:00
Adam Powell
178097727f Fix bug 2859423 - action bar: need a way to choose item in spinner 
Change-Id: Idf9c222e5d8f27b4339a6df7d14f3f10dcb4be2c
 2010-07-21 13:56:35 -07:00
Chet Haase
46ea482884 Merge "Fix issue with touch MOVE events on transformed containers" 2010-07-21 13:34:23 -07:00
Ben Komalo
d6665fc48e Merge "Relay stopLoading() on the loader from LoaderInfo.stop()" 2010-07-21 13:28:45 -07:00
Chet Haase
ddc8e713ba Fix issue with touch MOVE events on transformed containers 
Change-Id: I17e58f2c6acce606a672756d48d20eb0796b69e8
 2010-07-21 13:12:53 -07:00
Ben Komalo
f5100a7823 Relay stopLoading() on the loader from LoaderInfo.stop() 
Change-Id: Ie48b303cef4fe1b284d4ed6a1b310f3dcef20c91
 2010-07-21 13:10:30 -07:00
Jaikumar Ganesh
0c6cb717d5 Merge "Allow multiple HID devices to be connected." 2010-07-21 12:10:35 -07:00
Jaikumar Ganesh
05a1863ceb Allow multiple HID devices to be connected. 
Change-Id: I40d9820b756c1e3bb4e773fbb78212e2716e99bf
 2010-07-21 12:08:12 -07:00
Jaikumar Ganesh
679fc4e985 Merge "Add HID to the state machine and add native call backs." 2010-07-21 11:42:21 -07:00
Chet Haase
0cc6f8f3a3 Merge "Add keyframes to animation framework." 2010-07-21 11:08:29 -07:00
Jaikumar Ganesh
de07503a38 Add HID to the state machine and add native call backs. 
Change-Id: Ib9f3e476d4176bc04e23e7674dc54aa5a6417308
 2010-07-21 10:43:02 -07:00
The Android Open Source Project
63ae85f0e1 am 42ef77f3: merge from open-source master 
Merge commit '42ef77f3603ae54990d6718db79afae61e91dc61'

* commit '42ef77f3603ae54990d6718db79afae61e91dc61':
  Shoud specify the Resource class instance as an argument of the method
 2010-07-21 08:15:45 -07:00
The Android Open Source Project
42ef77f360 merge from open-source master 
Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747
 2010-07-21 08:07:26 -07:00
Chet Haase
3dd207a6db Add keyframes to animation framework. 
Change-Id: I5c8c8037aeeedae1ce7a18200986caf57264772f
 2010-07-21 08:00:40 -07:00
Adam Powell
e4e34965a6 Fix docs 
Change-Id: Ib96b693f6da716f87c5ce963ddc69f6bad3da6be
 2010-07-20 23:16:09 -07:00
Adam Powell
ccc626618f Merge "Refactored contextual modes out of action bar." 2010-07-20 20:28:31 -07:00
Jaikumar Ganesh
c3ee99d9eb Set initial HID profile preference. 
Change-Id: I804089cbea4ad25b87ade60fa8a905ddb167bff4
 2010-07-20 19:51:58 -07:00
Adam Powell
ac695c608b Refactored contextual modes out of action bar. 
Change-Id: I1fc1c9383e5ee90f135b92a5afa8eadbf1c13d20
 2010-07-20 18:56:59 -07:00
Jason Parks
ed38cf9089 am bc4fcec7: am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7'

* commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 16:55:01 -07:00
Dan Egnor
43b237bd95 am c78f9a0e: am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67'

* commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 16:54:57 -07:00
Dan Egnor
02b77f81cf am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'

* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 16:54:38 -07:00
Romain Guy
2a0a47892d Merge "Add preliminary support for text rendering." 2010-07-20 16:43:31 -07:00
Romain Guy
a1db574036 Add preliminary support for text rendering. 
Change-Id: I547eb631dbda24d13960d54b4144fb8908fd8a49
 2010-07-20 16:37:27 -07:00
Vasu Nori
487fab6837 Merge "make disableWriteAheadLogging method public so apps can disable WAL" 2010-07-20 15:36:31 -07:00
Jason Parks
bc4fcec70f am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp

* commit '29e25bd3418b04e395119bf99abe92898830a796':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 14:04:41 -07:00
Dan Egnor
c78f9a0e1b am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp

* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 14:04:33 -07:00
Jason Parks
29e25bd341 Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 2010-07-20 14:01:39 -07:00
Dan Egnor
3c1363beec am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread

* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 13:59:43 -07:00
Dan Egnor
79102ad0f5 am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp

* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 13:58:57 -07:00
Dan Egnor
2f0dc6d9f5 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Danica Chang
eaeffac5fc Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp" 2010-07-20 12:47:45 -07:00
Dan Egnor
341ff13689 resolved conflicts for merge of 9bc4039a to gingerbread 
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
 2010-07-20 11:30:17 -07:00
Jean-Baptiste Queru
99a518ffab resolved conflicts for merge of ca48433a to master 
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
 2010-07-20 10:40:17 -07:00
Jason Parks
94b916da2c Only print out wake locks in the if the wakelock was held. 
Change-Id: I742121b70bd0e56ca2efe05fffa9fe3e4ad7b619
 2010-07-20 12:39:07 -05:00
The Android Open Source Project
ca48433afc merge from open-source master 
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
 2010-07-20 10:33:38 -07:00
Vasu Nori
7b04c4176d make disableWriteAheadLogging method public so apps can disable WAL 
music2 app has the weird situation where it embeds the jumper C++ code
and that code uses its own version of sqlite.
so, java side may want to disable WAL to make c++ code work well with java
usage of sqlite.
since WAL is made default option for all apps, this CL makes it possible for
music2 app to disable WAL.

Change-Id: I39ddbc9b4648f12b206ff3e76d30341da5955bd4
 2010-07-20 10:31:21 -07:00
The Android Open Source Project
bd7599ff0c am fcff6910: merge from open-source master 
Merge commit 'fcff691057fecdedd6d3033da672d1a473c76066'

* commit 'fcff691057fecdedd6d3033da672d1a473c76066':
  typo fixed
 2010-07-20 10:28:35 -07:00
The Android Open Source Project
fcff691057 merge from open-source master 
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
 2010-07-20 10:25:37 -07:00
Dan Egnor
b3e4ef3702 COMMENT ONLY change to add some warnings about ParcelFileDescriptor 
behavior with Parcel.writeValue().

Change-Id: If55fcce29559379855735ff5297cf4f46d5d6be6
Bug: 2847738
 2010-07-20 10:24:38 -07:00
Chet Haase
358af100ed Merge "Fix bugs in Sequencer" 2010-07-20 10:07:53 -07:00
Masanori Ogino
708654c0b8 Shoud specify the Resource class instance as an argument of the method 
newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache'
(additional changes for ID:15815)
https://review.source.android.com/#change,15815

Change-Id: I6bf19b8e6e187df8c8e3cb57d9e04278ddfe5055
 2010-07-20 23:32:19 +09:00
Romain Guy
c0ac193b94 Add support for linear gradients. 
Change-Id: Id15329da065045b3f06fdaed615f33cd57608496
 2010-07-19 18:44:05 -07:00
Dan Egnor
9bc4039a58 Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo 2010-07-19 18:14:50 -07:00
Daniel Lehmann
156add9575 Replace try-catch code by proper type checking. Saves an exception for each blob. 
Change-Id: I208ed0acb754391bd44b52887792563e92b39011
 2010-07-19 18:01:28 -07:00
Chet Haase
010dbaa123 Fix bugs in Sequencer 
Change-Id: I03aebe8d822bef0b9e163ba3280699ca02a6563c
 2010-07-19 17:41:03 -07:00
Winson Chung
121d7d86d2 Merge "Fixing build breakage due to misnamed javadoc variable." 2010-07-19 16:07:33 -07:00
Winson Chung
95362595ed Fixing build breakage due to misnamed javadoc variable. 
Change-Id: I883a53107d2c0fcd4544c85811aeaad3fc4f13c2
 2010-07-19 16:05:50 -07:00
Christian Mehlmauer
798e2d3d0c Replaced /sdcard with Environment.getExternalStorageDirectory() 
Change-Id: Id789f44a8569e307b1b7ab15eb266c9ce7ef2029
 2010-07-19 15:54:40 -07:00
Adam Powell
16ba106de5 Merge "Fix docs for MenuItem#setShowAsAction" 2010-07-19 15:52:02 -07:00