Maksymilian Osowski
6540c26f58
Merge "Added recording of JS dialog messages."
2010-08-03 10:33:21 -07:00
Alex Sakhartchouk
a275354c54
Merge "Adding drop shadow support"
2010-08-03 10:14:51 -07:00
Maksymilian Osowski
40968a4540
Added recording of JS dialog messages.
...
Change-Id: I3854f1fea81d47255c9fb398bdcbdff5ed4d8a52
2010-08-03 18:02:42 +01:00
Robert Greenwalt
fa64bcfb01
Merge "Don't reset connections switching default->hipri"
2010-08-03 09:52:48 -07:00
Makoto Onuki
ec37c88570
Adding a method called when detecting content change.
...
Added Loader.onContentChanged() which is called by ForceLoadContentObserver
when it detects a change, rather than forceLoad().
By default onContentChanged() just calls forceLoad(), so there's no change
in behavior.
This is useful when a subclass wants to perform custom operations upon
data chantes. For example, a subclass may want to limit the number
of automatic requeries per second.
Change-Id: I493dac3f4f1a75b056d2c7065336ea9252dbf424
2010-08-03 09:30:47 -07:00
Maksymilian Osowski
100e106551
Merge "Changed the order of searching for expected result (and added additional location)."
2010-08-03 08:05:46 -07:00
Maksymilian Osowski
c83712e686
Changed the order of searching for expected result (and added additional location).
...
Change-Id: Ieb59ffcaeb999d0ed5a8445c97e6ea3bbe115e4d
2010-08-03 16:04:58 +01:00
Maksymilian Osowski
ef7f9d2458
Added wakelock to keep the screen from sleeping when executing tests.
...
Change-Id: Ib6a0ff2a7c906f500868269d6a617553733d33b1
2010-08-03 16:01:50 +01:00
Maksymilian Osowski
19ca35a066
Merge "Added detecting unimplemented layoutTestController functions and green squares."
2010-08-03 07:57:48 -07:00
Maksymilian Osowski
fb60226a03
Merge "First batch of layoutTestController functions + some fixes and tweaks."
2010-08-03 07:57:43 -07:00
Maksymilian Osowski
4a9e3a6dc3
Added detecting unimplemented layoutTestController functions and green squares.
...
Change-Id: Iaa7bbdb83a074a874a210f7975c6c3b731e0a924
2010-08-03 15:35:07 +01:00
Maksymilian Osowski
dd4bff62b5
First batch of layoutTestController functions + some fixes and tweaks.
...
Change-Id: I9dae192c498d8e19fd75861a1a6cf1f079ad9c6f
2010-08-03 15:22:34 +01:00
Romain Guy
7768e02973
Merge "Add support for ColorFilters."
2010-08-02 18:50:28 -07:00
Romain Guy
db1938e0e6
Add support for ColorFilters.
...
Color filters are fully supported and can be used with shaders.
Change-Id: Id90ccf1c81cb462f2431f366f3f8f710d7971e04
2010-08-02 18:50:56 -07:00
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
Alex Sakhartchouk
89a524ac2d
Adding drop shadow support
...
Change-Id: I9b1b9568d6cebc0761d96ab678b018571f705ae1
2010-08-02 17:52:30 -07:00
Vasu Nori
532abb6530
add public method in ContentValues to return set of all keys
...
why not this method? it is useful and cheap.
Change-Id: I5db96d149b13d26b5359b52515a8eabf033eb000
2010-08-02 17:46:57 -07:00
Oscar Montemayor
1da47a9401
Merge "Global Proxy changes to proxy class."
2010-08-02 17:02:13 -07:00
Jeff Sharkey
a8a72c38fe
Populate accessibility field on ActionBar items.
...
When building an ActionMenuItemView, set the content description based
on the item title. Fixes http://b/2885106
Change-Id: I101bbc6db7080ce08eed1bbb401c45329da2ab53
2010-08-02 16:30:20 -07:00
Oscar Montemayor
16fb7910fd
Global Proxy changes to proxy class.
...
Change-Id: Ib2da33670b1da33c0b35b60f4fcbd0bc084e616a
2010-08-02 16:29:29 -07:00
Vasu Nori
ec4ffa91e8
Merge "before shipping, remove stacktrace printing in requery-warning msg"
2010-08-02 16:22:22 -07:00
Robert Greenwalt
66ad9bb7a9
Merge "Always try to set/remove default routes"
2010-08-02 16:05:49 -07:00
Adam Powell
9168f0b170
Add ActionMode#getMenuInflater() for easier menu inflation in
...
ActionMode.Callback implementations
Change-Id: If9e7ab0d65598bab537add6c6a452a55c093064f
2010-08-02 16:02:24 -07:00
Robert Greenwalt
c76b8fa911
Always try to set/remove default routes
...
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on the same interface.
Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.
bug:2865974
Change-Id: I589a0b2768b5e67b608fde181e7ddbd7fce4f491
2010-08-02 15:40:21 -07:00
Gilles Debunne
8fbe89d2d1
Merge "Move pngs from drawable to drawable-mdpi in project frameworks/base"
2010-08-02 15:39:41 -07:00
John Wang
de9993c2ce
am e0b35c6d: (-s ours) am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread
...
Merge commit 'e0b35c6d44ea548b52a4e536b2dbd03c94b0afd3'
* commit 'e0b35c6d44ea548b52a4e536b2dbd03c94b0afd3':
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
2010-08-02 15:35:56 -07:00
John Wang
e0b35c6d44
am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread
...
Merge commit '8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp
* commit '8bffa72b9c711fec231108977ad9f2ba72678a82':
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
2010-08-02 15:33:47 -07:00
John Wang
8bffa72b9c
Merge changes Ic30e2801,I387bab4d into gingerbread
...
* changes:
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
2010-08-02 15:31:37 -07:00
Christopher Tate
1f4c67a4b1
am 79f2d005: am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread
...
Merge commit '79f2d00596b7e24a285443c8e9e77bece3f5e9e2'
* commit '79f2d00596b7e24a285443c8e9e77bece3f5e9e2':
Mute a common-case progress log about input injection
2010-08-02 15:27:26 -07:00
Gilles Debunne
b0dde8e9b5
Move pngs from drawable to drawable-mdpi in project frameworks/base
...
After error during file transfer...
Change-Id: I21da694f81a4290e9af1f7647a8ceb6c6d3d806b
2010-08-02 15:21:27 -07:00
Christopher Tate
79f2d00596
am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread
...
Merge commit 'a213ce02ced6511edf02e29c45057f344bfe8636' into gingerbread-plus-aosp
* commit 'a213ce02ced6511edf02e29c45057f344bfe8636':
Mute a common-case progress log about input injection
2010-08-02 15:19:19 -07:00
John Wang
4de9d20260
Handle call list in CallManager "do not merge".
...
Cherry-picked from master.
Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls
* 1. APIs to access list of calls
* 2. APIs to check if any active call, which has connection other than
* disconnected ones, pleaser refer to Call.isIdle()
* 3. APIs to return first active call
* 4. APIs to return the connections of first active call
* 5. APIs to return other property of first active call
Change-Id: Ic30e28018d14e496e9427f96fec8a7c2ff7c1549
2010-08-02 15:18:17 -07:00
Christopher Tate
a213ce02ce
Merge "Mute a common-case progress log about input injection" into gingerbread
2010-08-02 15:14:44 -07:00
John Wang
ccd88b6594
Create CallManager class "do not merge"
...
Cherry-pick from master.
Initial check-in to support multiple call channels.
Change-Id: I387bab4d69ee38d738c5e0e0a51f1ac6607b9759
2010-08-02 15:13:53 -07:00
Vasu Nori
e7fa4aeb60
before shipping, remove stacktrace printing in requery-warning msg
...
this is to reduce log spamming
Change-Id: I9b6e08905fbf7f880e49144a4ffcf01550a521c9
2010-08-02 15:06:52 -07:00
Vasu Nori
a17b5f7c81
Merge "do begin-end transaction before standalone insert/update/delete sql"
2010-08-02 14:52:23 -07:00
Xia Wang
3208c26f6d
Merge "Create Mock Ril Controller as a static library, Generate a simple test case using the controller, wrap tests uing mockril in a seperate package."
2010-08-02 14:52:21 -07:00
Vasu Nori
ce38b98feb
do begin-end transaction before standalone insert/update/delete sql
...
also fix bug# 2871037
Change-Id: I13325f8eabff4f218d3206905010803b61d8e2cd
2010-08-02 14:51:33 -07:00
Kenny Root
b0289f62af
am 59d4a536: am 739cdab7: Merge "Do not deference before null check" into gingerbread
...
Merge commit '59d4a5369cd68d4b65809ded407611b62b013f9a'
* commit '59d4a5369cd68d4b65809ded407611b62b013f9a':
Do not deference before null check
2010-08-02 13:31:41 -07:00
Kenny Root
59d4a5369c
am 739cdab7: Merge "Do not deference before null check" into gingerbread
...
Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp
* commit '739cdab7cb63d53440bb411fa2d558e2114b4c81':
Do not deference before null check
2010-08-02 13:29:01 -07:00
Kenny Root
739cdab7cb
Merge "Do not deference before null check" into gingerbread
2010-08-02 12:33:40 -07:00
Xia Wang
237e594402
Create Mock Ril Controller as a static library,
...
Generate a simple test case using the controller,
wrap tests uing mockril in a seperate package.
Change-Id: Iae9422ec30963aae79cc1b58e17df6cff16955c8
2010-08-02 12:20:30 -07:00
Wink Saville
ae2036a8f9
am 7472c219: am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
Merge commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2'
* commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:09:03 -07:00
Nipun Kwatra
c3c9f12b08
Merge "including limits.h to fix simulator build."
2010-08-02 12:08:42 -07:00
Wink Saville
7472c219a1
am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp
* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:06:34 -07:00
Wink Saville
1540a7ea1a
am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread
* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:02:42 -07:00
Christopher Tate
09e85dc027
Mute a common-case progress log about input injection
...
Change-Id: I37c9f5cb239ab93fde3a42f71f2782d8734c53ce
2010-08-02 11:59:11 -07:00
Daniel Sandler
6976e1d0d7
Merge "Actually reference the fixed Proguard flags."
2010-08-02 11:53:59 -07:00
Daniel Sandler
1ab5cae8df
Actually reference the fixed Proguard flags.
...
Bug: 2869888
Change-Id: I3277b51cd411c7933607c08b6022870ef83e9197
2010-08-02 14:53:16 -04:00
Adam Powell
d3122de292
Merge "Added CHOICE_MODE_MULTIPLE_MODAL to ListView."
2010-08-02 11:32:57 -07:00