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

33281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
c7e4b2d5bb am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32'

* commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
 2010-10-08 18:28:20 -07:00
Adam Powell
d856b1ce92 resolved conflicts for merge of 86b50028 to master 
Change-Id: I3468e67ac17f861c5491717337c27cd49bd5287e
 2010-10-08 18:23:49 -07:00
Dianne Hackborn
ca33268ef8 am 18e225b4: am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback 
Merge commit '18e225b42b77c48efa63f245a4137c5f74302e26'

* commit '18e225b42b77c48efa63f245a4137c5f74302e26':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
 2010-10-08 17:59:52 -07:00
Eric Fischer
c400cbb45d am 7778173a: (-s ours) am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '7778173a32edcfccdcc31407169d2ec40916ca2f'

* commit '7778173a32edcfccdcc31407169d2ec40916ca2f':
  Import revised translations.  DO NOT MERGE
 2010-10-08 17:59:33 -07:00
Xavier Ducrohet
79d433dd87 am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread 
Merge commit '556866a2ea1f4758a79fe4f207153b71815ed400'

* commit '556866a2ea1f4758a79fe4f207153b71815ed400':
  Parser is optional in obtainStyledAttributes.
 2010-10-08 17:59:13 -07:00
Hung-ying Tyan
1d8db8a0a8 am 909a974f: am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread 
Merge commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e'

* commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e':
  SIP: Fix busy authentication loop.
 2010-10-08 17:58:55 -07:00
Dianne Hackborn
d7dccd2611 am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread 
Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'

* commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f':
  Make Activity.removeDialog() less strict.
 2010-10-08 17:58:35 -07:00
Kenny Root
682d143dec am 6ed0cfd3: am 5919ac6b: OBB: track binder death observers 
Merge commit '6ed0cfd3e798e3014c9f1099631249463d25140c'

* commit '6ed0cfd3e798e3014c9f1099631249463d25140c':
  OBB: track binder death observers
 2010-10-08 17:58:15 -07:00
Kenny Root
06f89ca9b1 am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread 
Merge commit '36455d03256024981b1bf21557722a010b5e092a'

* commit '36455d03256024981b1bf21557722a010b5e092a':
  Add MountService tests and fix a bug it found
 2010-10-08 17:57:55 -07:00
Dianne Hackborn
fa9921e4bc am e89bf502: am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'

* commit 'e89bf50261902bf263887923bf95595ec8eae069':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
 2010-10-08 17:57:35 -07:00
Gilles Debunne
82c52ee738 am f960718c: (-s ours) am 1ae32bfe: New assets for buttons and notification 
Merge commit 'f960718c1c02186746873ec4a669028bb8ea9d94'

* commit 'f960718c1c02186746873ec4a669028bb8ea9d94':
  New assets for buttons and notification
 2010-10-08 17:57:16 -07:00
Dianne Hackborn
13d31e0162 am cef38339: am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread 
Merge commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37'

* commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37':
  Make USB mass storage hide keyguard when shown.
 2010-10-08 17:45:08 -07:00
Adam Powell
54ca811b29 Merge "Fix alert dialog layout size in landscape" 2010-10-08 17:10:24 -07:00
Chung-yih Wang
7ff6f97f84 resolved conflicts for merge of 4790a2e2 to master 
Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
 2010-10-09 08:07:55 +08:00
Adam Powell
4fb17b0490 Fix alert dialog layout size in landscape 
Change-Id: Iff5c388655c357e78c0c0e98d718fb7601c2d543
 2010-10-08 17:04:39 -07:00
Jason Chen
39b4867d48 Revert "Merge "Allow notifications to not specify a contentIntent."" 
This reverts commit 8885321046622d6a8c0a4214af98dc27eecd48a0, reversing
changes made to 61b8aaadd742f0be708cd37971d2c9e822bf778a.
 2010-10-08 16:22:53 -07:00
Romain Guy
1cb9465372 Merge "Better cache for layers, reduce memory usage and increase framerate." 2010-10-08 15:52:02 -07:00
Romain Guy
8550c4c7b5 Better cache for layers, reduce memory usage and increase framerate. 
Change-Id: I5ff864a361db4791bd5ff6be716f7ce692ef572d
 2010-10-08 15:49:53 -07:00
Amith Yamasani
0594476ffa SearchView: Add some more listeners, IME dismiss improvements and focus control. 
Addresses following bugs:
3067611 : Submit button incorrectly displayed
3064371 : Callback to report suggestion click
3008580 : Setting initial focus

The SearchView will take initial focus now, reverting an earlier change. If
you don't want it to take initial focus, then you must requestFocus on a
different view on launching the activity, since the initial focus is desirable
in other cases. This is normal behavior for all EditText widgets and SearchView
shouldn't have a different behavior.
 2010-10-08 15:49:37 -07:00
Mike Dodd
9568a5ab2e Merge "HardwareRenderer: When throwing an exception because of an EGL error, include the specific error." 2010-10-08 15:33:45 -07:00
Joe Onorato
8885321046 Merge "Allow notifications to not specify a contentIntent." 2010-10-08 15:16:14 -07:00
Alex Sakhartchouk
61b8aaadd7 Merge "Removing fixed size arrays." 2010-10-08 15:04:29 -07:00
Alex Sakhartchouk
6f91cb6af7 Removing fixed size arrays. 
Change-Id: I5c65b29a197013de2517cfb6dbe7abb9e24a688b
 2010-10-08 15:00:05 -07:00
Joe Onorato
80a752c537 Allow notifications to not specify a contentIntent. 
If they don't, the click events will be passed through to the individual
views in the notification view, which may have their own PendingIntents
attached.

Previously, it was against the UX spec to allow this, but now we are
changing that and will have buttons in there.

Change-Id: Ie3b2e96c6a1c4449fa86ed571f3ad0f047320d31
 2010-10-08 17:57:18 -04:00
Gil Dobjanschi
bced934da0 Merge "Hide project media by creating the .nomedia file" 2010-10-08 14:57:05 -07:00
Vasu Nori
ee7e28e20d Merge "when printing requery on UI warning, include additional info" 2010-10-08 14:50:59 -07:00
Vasu Nori
f0808f810e when printing requery on UI warning, include additional info 
this hsould help figure out which module is doing query on UI thread.

Change-Id: If3062a35fa1fb50063b678c3c9311d6b1504fa9b
 2010-10-08 14:48:48 -07:00
Gil Dobjanschi
ce52d1ff76 Hide project media by creating the .nomedia file 
Change-Id: I4ef1f16ceaa211b7f614cb3dfffa5beb4ae3e8de
 2010-10-08 14:44:36 -07:00
Mike Dodd
5d3e2ea6f3 HardwareRenderer: When throwing an exception because of an EGL 
error, include the specific error.

Change-Id: I8e4b0cdbc207824df4f4bb55c3b379b0ee4aeec2
 2010-10-08 14:43:16 -07:00
Irfan Sheriff
8163315095 Merge "Use LinkProperties for IP and proxy configuration" 2010-10-08 14:09:49 -07:00
Adam Powell
c459622dd1 Merge "Holo theme progress and assets!" 2010-10-08 13:52:55 -07:00
Mathias Agopian
118c8490da Merge "fix a bug where timeouts would only be handled when a message was delivered" 2010-10-08 13:46:07 -07:00
Joe Onorato
481bbb9c11 Merge "Get rid of the global actions menu on tablets." 2010-10-08 13:29:37 -07:00
Joe Onorato
d208e70926 Get rid of the global actions menu on tablets. 
We have the system tray for that stuff.  Make long press on power
go directly to the shut down confirmation dialog.  Make that dialog
auto dismiss when the screen goes off.  Reword it when we're skipping
the global actions menu, because it feels too abrupt to say "The
phone will shut down" when they haven't clearly pressed a button
that says shut down.

Change-Id: I8c92a1362bd4ed242e6cd94c2dae6d9ff9c4c34d
 2010-10-08 16:28:05 -04:00
Adam Powell
2fbf4de64f Holo theme progress and assets! 
* Light and dark dialogs
* Checkboxes and radio buttons
* Toggle buttons

Warning! This is still a work in progress. This does not include final metrics.
Some assets (specifically dialogs) are currently misaligned.
 2010-10-08 13:25:17 -07:00
Jason Chen
c8cc6580eb Merge "Resolved conflicts for merge of 2bd6afed to master" 2010-10-08 13:15:11 -07:00
Mike Lockwood
c3f8f2bef3 Merge "MTP: Throw a NullPointerException if client is null in MtpCursor constructor" 2010-10-08 13:12:39 -07:00
Jason Chen
1a469ca1cb Resolved conflicts for merge of 2bd6afed to master 
Change-Id: Ic9e854838004e9c5505cc1df8399cee3caa5e4e9
 2010-10-08 13:09:31 -07:00
Elliott Hughes
6190ba5a94 Merge "NIOTest fixes." 2010-10-08 12:59:43 -07:00
Jim Miller
e6089612ec Merge "Fix RecentApps to properly load new thumbnails." 2010-10-08 12:53:14 -07:00
Jim Miller
1657f43095 Merge "Fix 3061025: Extend wave lockscreen timeout while grabbed." 2010-10-08 12:52:24 -07:00
Mathias Agopian
fe0ed4575e Merge "Fix a null dereference" 2010-10-08 12:44:19 -07:00
Irfan Sheriff
96ca91761e Use LinkProperties for IP and proxy configuration 
Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270
 2010-10-08 12:41:11 -07:00
Mike Lockwood
069ead3adc MTP: Throw a NullPointerException if client is null in MtpCursor constructor 
Change-Id: Ia2a19ddcc5cacb54d9fcbe55bce1de1aed515424
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2010-10-08 15:39:48 -04:00
Dianne Hackborn
c4dfe3d5c0 am 92d29c66: am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread 
Merge commit '92d29c66f5cb69627172d21057e672eaba2eb03f'

* commit '92d29c66f5cb69627172d21057e672eaba2eb03f':
  Fix NPE if there is no accelerometer.
 2010-10-08 12:39:14 -07:00
Dianne Hackborn
a1b0d6966e resolved conflicts for merge of efa4f7f8 to master 
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
 2010-10-08 11:09:38 -07:00
Hung-ying Tyan
026284745b am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'

* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
  CallManager/SipPhone: fix reject a ringing call
 2010-10-08 10:25:50 -07:00
Fred Quintana
c6a69559cb Add getCurrentSyncs() to the SDK, which replaces the deprecated 
getCurrentSync().

Change-Id: I1112df41e48ed93ff4c0c5af4825dbdce0c4cccc
 2010-10-08 09:50:45 -07:00
Gilles Debunne
fdcd2660ec Merge "resolved conflicts for merge of ba04dbc6 to master" 2010-10-08 09:20:57 -07:00
Daniel Sandler
e7aa07852d Merge "Start of input method control on system bar." 2010-10-08 08:14:12 -07:00