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

30238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
bdce3d2c35 am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
  Telephony: Fix cb sms implementation
 2011-02-09 13:45:37 -08:00
Wink Saville
01a5eba810 am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '6e25789fbe7ac283021156b17f406acb48850292':
  Telephony: Fix cb sms implementation
 2011-02-09 13:42:45 -08:00
Wink Saville
6e25789fbe Merge "Telephony: Fix cb sms implementation" 2011-02-09 13:09:24 -08:00
Mathias Agopian
d0f27f435e am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 
* commit 'ada1b6f297596cac4451edbc83df060a31cdda68':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
 2011-02-09 13:09:12 -08:00
Mathias Agopian
ada1b6f297 Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 2011-02-09 13:06:00 -08:00
Scott Main
b605869cd3 am 07cefd3c: add 2.3.3 announcement to site home page 
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
  add 2.3.3 announcement to site home page
 2011-02-09 13:03:11 -08:00
Scott Main
07cefd3cc3 add 2.3.3 announcement to site home page 
Change-Id: I4323a1a30fad8a67cce55baba9f7a89c4bdd4494
 2011-02-09 10:17:08 -08:00
Jeff Hamilton
c1cc9ba6d1 am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
  More documentation updates for NFC.
 2011-02-09 00:36:53 -08:00
Jeff Hamilton
58c9d4726e Merge "More documentation updates for NFC." into gingerbread 2011-02-09 00:34:22 -08:00
Jeff Hamilton
28319c0cec More documentation updates for NFC. 
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
 2011-02-09 17:26:47 +09:00
Dirk Dougherty
8d56f6decf am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 
* commit 'a3f53afd13bc1722464e169cb82a01d3898852b5':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-08 23:27:53 -08:00
Nick Pelly
47dac545da am 39cf3a44: Document NFC permissions. 
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
  Document NFC permissions.
 2011-02-08 23:25:29 -08:00
Dirk Dougherty
a3f53afd13 Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 2011-02-08 23:24:22 -08:00
Nick Pelly
39cf3a445e Document NFC permissions. 
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
 2011-02-09 16:10:46 +09:00
Dirk Dougherty
237a3440d3 Doc change: Add version notes for Android 2.3.3. 
Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
 2011-02-08 20:10:51 -08:00
Jeff Hamilton
1ac35411f1 am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '584afa8dde1777b181e773a491416769f25607a8':
  Improve the docs a bit for foreground dispatch.
 2011-02-08 19:33:53 -08:00
Jeff Hamilton
584afa8dde Merge "Improve the docs a bit for foreground dispatch." into gingerbread 2011-02-08 19:30:47 -08:00
Jeff Hamilton
167d9e473f Improve the docs a bit for foreground dispatch. 
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
 2011-02-09 12:30:18 +09:00
Eric Fischer
c1c3143347 am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
  Import revised translations.  DO NOT MERGE
 2011-02-08 17:32:18 -08:00
Scott Main
129c73723f am 3c01a139: rename SIP doc title 
* commit '3c01a139f0d8ece0e300be26ac41280f1e934747':
  rename SIP doc title
 2011-02-08 17:32:14 -08:00
Scott Main
42f1819497 am c442bc60: docs: move the SIP guide into guide/network/ 
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
  docs: move the SIP guide into guide/network/
 2011-02-08 17:32:06 -08:00
Katie McCormick
690d31a6a8 am 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API 
* commit '7134520b2635474c5e7f4902c26e12d0ffcc9c64':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
 2011-02-08 17:31:59 -08:00
Dirk Dougherty
be04bfd099 am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit '01967c0ee104e985167374e41f2c416c1100f767':
  Doc change: Add diff report for api 10.
 2011-02-08 17:31:54 -08:00
Gilles Debunne
63bd55c7bf am cdfe8999: Fix for multiple merge problem. 
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
 2011-02-08 17:31:33 -08:00
Alex Yakavenka
f7de51cc4d Telephony: Fix cb sms implementation 
Change-Id: Ie2a678e3ab99f0d5b9dd68cc4a79e1c5a58ecbe2
 2011-02-08 17:18:46 -08:00
Gilles Debunne
e04c14962f resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp 
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
 2011-02-08 16:33:58 -08:00
Eric Fischer
be4b39d2fd Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-08 10:00:24 -08:00
Scott Main
3c01a139f0 rename SIP doc title 
Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8
 2011-02-08 09:37:47 -08:00
Scott Main
c442bc605c docs: move the SIP guide into guide/network/ 
Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
 2011-02-07 18:35:49 -08:00
Katie McCormick
7134520b26 cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 
Doc change: Adding new docs for SIP API

Change-Id: I62bedbcaab3900edcc49d67b59279c5025977a95
 2011-02-07 18:32:04 -08:00
Dirk Dougherty
01967c0ee1 Merge "Doc change: Add diff report for api 10." into gingerbread 2011-02-07 17:21:56 -08:00
Eric Fischer
dff2fea9b1 Import revised translations. DO NOT MERGE 
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
 2011-02-07 13:17:26 -08:00
Brad Fitzpatrick
a62bf8bb6b am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" 
* commit 'b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
  Fix a race condition in NativeDaemonConnector
 2011-02-07 10:07:46 -08:00
Brad Fitzpatrick
b901c9abff am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" 
* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
  Fix a race condition in NativeDaemonConnector
 2011-02-07 10:04:54 -08:00
Brad Fitzpatrick
9204644d9e Merge "Fix a race condition in NativeDaemonConnector" 2011-02-07 09:55:34 -08:00
anga
030bc88b4c Fix a race condition in NativeDaemonConnector 
Fixes a race between the onDaemonConnected callback and setting the
mOutputStream in NativeDaemonConnector.

MountService connects to vold using the NativeDaemonConnector.
Throws a “NativeDaemonConnectorException: No output stream!”
when the onDaemonConnected callback in MountService calls the doListCommand.

Change-Id: Ib895bab37f7df680e4362df6366198c0a673c5e9
 2011-02-07 09:53:59 -08:00
Dianne Hackborn
6b497a0446 am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition." 
* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
  Fixing possible race condition.
 2011-02-07 07:51:34 -08:00
Dianne Hackborn
4b7c1cacca am bb2e1ef8: Merge "Fixing possible race condition." 
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
  Fixing possible race condition.
 2011-02-07 07:33:38 -08:00
Dianne Hackborn
bb2e1ef87f Merge "Fixing possible race condition." 2011-02-06 09:06:35 -08:00
Gilles Debunne
cdfe899991 Fix for multiple merge problem. 
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
 2011-02-04 16:50:01 -08:00
Kenny Root
c4dfa998b7 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:12:14 -08:00
Kenny Root
d2a996173e am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:01:13 -08:00
Gilles Debunne
1ba2a47b82 am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
 2011-02-04 15:50:15 -08:00
Gilles Debunne
826fbdf7b6 am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 
* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
  All runnable are stopped on detach. DO NOT MERGE.
 2011-02-04 15:50:12 -08:00
Gilles Debunne
c0728cc042 Double tap triggers text selection in a TextView. DO NOT MERGE 
This is a convenient way to switch to selection mode without the
context menu. Context menu is still available and offerts Select Input method option.

Browser overloads touch events and this feature is not available in Browser which
limits the conflict with double tap zoom in browser.

Change-Id: I286504cf03733d5c2fb9bc01765f713d14bbd2f4
 2011-02-04 15:50:10 -08:00
Gilles Debunne
2f7e9d403a am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
 2011-02-04 15:49:56 -08:00
Gilles Debunne
893ac28f75 Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 2011-02-04 15:46:15 -08:00
Gilles Debunne
8a6ba494a2 Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 2011-02-04 15:46:11 -08:00
Gilles Debunne
53841df2a4 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 2011-02-04 15:46:06 -08:00
Kenny Root
c94a99987d Merge "JPtextinput: Dont break emoji characters when cutting strings." 2011-02-04 15:42:14 -08:00