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

21709 Commits

Author SHA1 Message Date
Romain Guy
e91a9c7ab0 Remove unnecessary code. 
Change-Id: I0352bf861192df51fe78873d439e8d7ff887118e
 2011-05-02 14:53:30 -07:00
Robert Greenwalt
a8e0dfae06 resolved conflicts for merge of db46fa25 to master 
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
 2011-05-02 14:41:57 -07:00
Irfan Sheriff
d713683f9f am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 13:29:36 -07:00
Robert Greenwalt
db46fa25be am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
 2011-05-02 13:29:22 -07:00
Robert Greenwalt
a47c40193f Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
d369d64ee7 am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 12:26:52 -07:00
Wink Saville
a0449f03eb Resolve merge conflicts for merge of 21083066 to master. 
Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
 2011-05-02 12:13:44 -07:00
Wink Saville
210830664d am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE 
* commit '7e74c60db5261ea137c8f6672f8573873eb5814e':
  Enhance AsyncChannel.
 2011-05-02 11:51:36 -07:00
Irfan Sheriff
8ab6a6d415 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes. 
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
 2011-05-02 11:17:30 -07:00
Wink Saville
0246bbc8d7 Enhance AsyncChannel. 
- Use  Protocol for BASE of CMD's.
- Add synchronous connect methods.
- Back port sha1 c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd from master

Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
 2011-05-02 10:44:56 -07:00
Conley Owens
e8141854dc am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m 
* commit 'dddaa56f793ad9ecb4e20df746f562ac7f24d158':
  Scolling using arrow keys with padding
 2011-05-02 10:28:26 -07:00
Conley Owens
f4c4a276e2 Merge commit 'f395e304' into m 
Conflicts:
	core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
 2011-05-02 10:25:55 -07:00
Conley Owens
e7cb25916c am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '1eb31b434fdc325c55b65ecf1783c63b2fdfa669':
  Fix memory leak of SkMovie class
 2011-05-02 10:11:52 -07:00
Conley Owens
4c79ca8cae am c30d7676: am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal 
* commit 'c30d767628861b0bbea907824682e47732c820f9':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
 2011-05-02 10:11:43 -07:00
Conley Owens
5e3357fcee Merge commit '5eb49e0f' into m 
Conflicts:
	core/java/com/android/internal/os/BatteryStatsImpl.java

Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12
 2011-05-02 09:59:30 -07:00
Conley Owens
9c4ba2580e Merge "Removing dead store; it was likely a relict of debuging code." 2011-05-02 09:53:25 -07:00
Eino-Ville Talvala
3773eef4e3 Add an auto-exposure lock feature to the Camera API. 
Adds a new camera parameter for locking auto-exposure to its current
value. Also adds a function for checking if auto-exposure lock is
supported by the current platform.

Hidden for now.

Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
 2011-05-02 09:36:06 -07:00
Irfan Sheriff
31be7cf4c7 Add DhcpStateMachine for interation with dhcpcd 
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
  to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
 2011-04-30 12:58:51 -07:00
Conley Owens
a3dcd0a3f1 Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
Conflicts:
	core/java/android/view/ViewConfiguration.java

Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
 2011-04-29 17:49:06 -07:00
Conley Owens
dddaa56f79 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m 
Conflicts:
	core/java/android/widget/ScrollView.java

Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
 2011-04-29 17:35:29 -07:00
Conley Owens
f395e3042a am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 
* commit '19653c6440eaf7328ecbc01c3ca6d7a910906484':
  CHAR_SEQUENCE_CREATOR cannot handle null string
 2011-04-29 17:15:39 -07:00
Conley Owens
1eb31b434f am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '718516f3b73468c480ef8d2283a1c80a6223658d':
  Fix memory leak of SkMovie class
 2011-04-29 17:15:09 -07:00
Conley Owens
c30d767628 am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > 
* commit '1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
 2011-04-29 17:07:14 -07:00
Conley Owens
5eb49e0f1e am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()" 
* commit 'e321d06430304fa93282c765aa6070c908121a16':
  Adding a sanity test in the while loop in readHistory()
 2011-04-29 16:44:14 -07:00
Scott Main
bd3ddbb809 am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '75c78dc364efb74c2d7c0187b3b26d0ab70e3c3e':
  docs: more documentation for ProgressBar
 2011-04-29 15:11:50 -07:00
Conley Owens
19b7cd95ff am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit 'c703b49eb13993c45a1cab7ea1130601fba1df3e':
  Added null check on return value for getKeyDispatcherState()
 2011-04-29 15:11:48 -07:00
Conley Owens
a02a9e602b am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check." 
* commit '27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
  Using robust equality check.
 2011-04-29 15:11:34 -07:00
Conley Owens
1b38cc3057 am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references." 
* commit '014757eea22fc9cceede1548c579c33c79464001':
  We don't need these local references.
 2011-04-29 15:11:30 -07:00
Conley Owens
95b533911c am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." 
* commit '49df110aeb94ada810a8eec0540e30a25c267a56':
  Eliminating dead code with no other effect than consuming battery life.
 2011-04-29 15:11:26 -07:00
Svetoslav Ganov
f0f955e2c3 Merge "Touch exploration - nits" 2011-04-29 15:10:14 -07:00
Svetoslav Ganov
887e1a17eb Touch exploration - nits 
Change-Id: Ie49558e0a81218dbad70c02f81dd7a59b3213d5c
 2011-04-29 15:09:28 -07:00
Scott Main
75c78dc364 am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
  docs: more documentation for ProgressBar
 2011-04-29 15:05:10 -07:00
Scott Main
511ec082bb am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
 2011-04-29 14:59:08 -07:00
Conley Owens
c703b49eb1 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit '54668b8a3599559fc007af1d75c039400a05e898':
  Added null check on return value for getKeyDispatcherState()
 2011-04-29 14:57:53 -07:00
Conley Owens
27e8f1a3a6 am 8b22ef66: am e41d2aed: Merge "Using robust equality check." 
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
  Using robust equality check.
 2011-04-29 14:56:15 -07:00
Conley Owens
014757eea2 am a9517012: am 1e29552b: Merge "We don\'t need these local references." 
* commit 'a95170122619f5442d5efbdf2e37f91dbf455ab9':
  We don't need these local references.
 2011-04-29 14:56:05 -07:00
Conley Owens
49df110aeb am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." 
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
  Eliminating dead code with no other effect than consuming battery life.
 2011-04-29 14:55:55 -07:00
Scott Main
de506220d8 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
 2011-04-29 14:55:43 -07:00
Scott Main
42f139c069 docs: more documentation for ProgressBar 
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
 2011-04-29 14:51:05 -07:00
Gilles Debunne
939ccad344 Merge "SuggestionSpans are removed around edited text." 2011-04-29 13:30:03 -07:00
Gilles Debunne
75beb336f4 SuggestionSpans are removed around edited text. 
SuggestionSpans do not make sense anymore when the text they
refer to is modified. Removed these at the lowest possible common
level: In the SpannableStringBuilder that is used to back the Editable.

This way, IME do not have to care about removing these when they change
text. And they cannot forget to so either.

Also fixed a bug in TextView's paste with multi-item paste text (never
exercised, since we have no source for such a thing).

Change-Id: I08ed921f8c04ffb1a00936a3e554a85ee82f103c
 2011-04-29 13:27:37 -07:00
Conley Owens
a3be387375 am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value" 
* commit 'eb8171bcff9bd980dbdfc99b2d843a5bcc0ae3e5':
  Adjust mBiggerTouchSlopSquare to the suitable value
 2011-04-29 10:24:34 -07:00
Conley Owens
b737647db8 am 76616b13: Merge "Scolling using arrow keys with padding" 
* commit '76616b138eb68a77a838a93fdf2f0322e982f706':
  Scolling using arrow keys with padding
 2011-04-29 10:24:29 -07:00
Conley Owens
19653c6440 am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 
* commit '425db473a05e4204301bf46d4ab6f51b12d9c447':
  CHAR_SEQUENCE_CREATOR cannot handle null string
 2011-04-29 10:24:23 -07:00
Conley Owens
718516f3b7 am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '9fd8e0579fb3306f61ba1716b1977562ae3626e1':
  Fix memory leak of SkMovie class
 2011-04-29 10:24:08 -07:00
Conley Owens
1a846ab089 am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal 
* commit 'b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
 2011-04-29 10:23:58 -07:00
Conley Owens
e321d06430 am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()" 
* commit '2f463ef18bb235be57b39cbda536bcd2df2d0908':
  Adding a sanity test in the while loop in readHistory()
 2011-04-29 10:23:28 -07:00
Conley Owens
eb8171bcff Merge "Adjust mBiggerTouchSlopSquare to the suitable value" 2011-04-29 10:01:23 -07:00
Conley Owens
76616b138e Merge "Scolling using arrow keys with padding" 2011-04-29 10:00:26 -07:00