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

64198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Owen Lin
391a4a719e am 130f62ab: Fix the build. (Change LOGV to ALOGV) 
* commit '130f62ab014ad95e6dc03ff219a581c8b93c82e4':
  Fix the build. (Change LOGV to ALOGV)
 2011-12-12 00:22:07 -08:00
Owen Lin
130f62ab01 Fix the build. (Change LOGV to ALOGV) 
Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
 2011-12-12 16:17:34 +08:00
Makoto Onuki
8a9ce72e8f am 95ea6d6d: Merge "MCC detection fixes for CountryDetector" 
* commit '95ea6d6d5d56a7e9e533abe2837ed2379c4271e1':
  MCC detection fixes for CountryDetector
 2011-12-10 13:25:38 -08:00
Makoto Onuki
95ea6d6d5d Merge "MCC detection fixes for CountryDetector" 2011-12-10 13:23:59 -08:00
Andreas Huber
ac66d3a4e8 am 1f7817e1: am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit '1f7817e1461f4af304d60cc3849d532288e4d2de':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-09 18:11:46 -08:00
Andreas Huber
6bc41e71e6 am 61a8b530: am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit '61a8b5301b9cf3abef9f1b9fa5af55912cb9d9c7':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-09 18:11:44 -08:00
Svetoslav Ganov
86747ed6c7 am 47730f15: am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 
* commit '47730f1582dfa67909293d6d5b88ff89c5ad6ed5':
  NumberPicker getting stuck if scroll wheel not wrapable.
 2011-12-09 18:11:43 -08:00
Irfan Sheriff
cb556b5d49 am ecd7798c: am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1 
* commit 'ecd7798ce45f9c8f1901c9348ad5452e0bc88a95':
  Handle emergency call back mode correctly
 2011-12-09 18:11:41 -08:00
Gilles Debunne
e3f4aeafaf am 70511ade: am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1 
* commit '70511ade47f75160bdfbf0693145a4b827294136':
  Make the Next key navigate between TextViews
 2011-12-09 18:11:39 -08:00
Gilles Debunne
73a09e5116 am 2afcfa42: resolved conflicts for merge of 5371a165 to master 
* commit '2afcfa42392996525c6a995b354b241f22429959':
  Limit created string size in Spell Checker
 2011-12-09 18:09:36 -08:00
Andreas Huber
1f7817e146 am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-09 18:09:21 -08:00
Andreas Huber
61a8b5301b am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-09 18:09:19 -08:00
Svetoslav Ganov
47730f1582 am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 
* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
  NumberPicker getting stuck if scroll wheel not wrapable.
 2011-12-09 18:09:16 -08:00
Irfan Sheriff
ecd7798ce4 am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1 
* commit 'a3c7c35873235486787d58fa8310eebd87508bc9':
  Handle emergency call back mode correctly
 2011-12-09 18:09:07 -08:00
Gilles Debunne
70511ade47 am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1 
* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
  Make the Next key navigate between TextViews
 2011-12-09 18:09:03 -08:00
Gilles Debunne
2afcfa4239 resolved conflicts for merge of 5371a165 to master 
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
 2011-12-09 18:06:34 -08:00
Makoto Onuki
f9165b7e43 MCC detection fixes for CountryDetector 
- Don't get and cache phone tpe at the initialization time.  At this point
TelephonyManager is probably not ready yet.

- Refresh MCC whenever we get the service state changed callback, even when
the state hasn't actually changed, in order to make sure we get refresh
country properly when MCC changes.

- Also remove the initialization of mPhoneStateListener, which prevented us from
registering phone state listener properly.

- Also fix tests which were already failing.

Bug 5670680

Change-Id: Id45abeba1b1e843053ac2c946861b439ca568de4
 2011-12-09 17:55:18 -08:00
Claudia de Veaux
ed64214a21 am f3aa0f78: Merge "Edit to string to change "double-touch" to "double-tap" per standard language." 
* commit 'f3aa0f78fffeca0dd7b632262def3c78ff7e0e7c':
  Edit to string to change "double-touch" to "double-tap" per standard language.
 2011-12-09 16:43:42 -08:00
Claudia de Veaux
f3aa0f78ff Merge "Edit to string to change "double-touch" to "double-tap" per standard language." 2011-12-09 16:42:11 -08:00
Steven Ross
024bbc58ee am e4067fac: Merge "Checking whether screen is on in constructor fixes 5658742" 
* commit 'e4067faca93ee1669c7b68d5e767317c0bbad9c1':
  Checking whether screen is on in constructor fixes 5658742
 2011-12-09 16:31:22 -08:00
Steven Ross
e4067faca9 Merge "Checking whether screen is on in constructor fixes 5658742" 2011-12-09 16:28:39 -08:00
Irfan Sheriff
076b6445c0 am c4ea8dfd: Remove explicit network disabling code 
* commit 'c4ea8dfd46a5eeeedd15664a6499ecde32985509':
  Remove explicit network disabling code
 2011-12-09 15:23:51 -08:00
Irfan Sheriff
c4ea8dfd46 Remove explicit network disabling code 
We are going to always disable the notification

Bug: 5556629
Change-Id: I981eb55a1bb6f44defd674e3a86d9c6f3805f4fc
 2011-12-09 15:06:20 -08:00
Eric Fischer
014fce79f9 am 049bc558: am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '049bc558b3c0dc437dbc67d827318135a772850d':
  Import revised translations. DO NOT MERGE
 2011-12-09 15:03:51 -08:00
The Android Open Source Project
af3488eeff am 57c82bf0: am abe0ed49: am 641a5624: Reconcile with ics-mr0-release 
* commit '57c82bf0bc369b7313c4a9ddec4ae933d025e91b':
 2011-12-09 15:03:49 -08:00
The Android Open Source Project
4dab4dfea8 am e2d4301f: am 54854d31: Reconcile with ics-mr0-release ics-mr1-release 
* commit 'e2d4301f7119fc21ba5e867d9793cd73e089264b':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-09 15:03:47 -08:00
Eric Fischer
049bc558b3 am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
  Import revised translations. DO NOT MERGE
 2011-12-09 14:58:10 -08:00
The Android Open Source Project
57c82bf0bc am abe0ed49: am 641a5624: Reconcile with ics-mr0-release 
* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':
 2011-12-09 14:58:07 -08:00
The Android Open Source Project
e2d4301f71 am 54854d31: Reconcile with ics-mr0-release ics-mr1-release 
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-09 14:57:48 -08:00
Claudia de Veaux
c4c1ff90be Edit to string to change "double-touch" to "double-tap" per standard language. 
Bug: 5163232
Change-Id: Ifa045b16f52623005308a3ce9e4086c4e9e4590b
 2011-12-09 14:42:54 -08:00
Nick Pelly
6a27cad3a0 am 1db7a31a: Merge "Add BluetoothAdapter.getRemoteDevice(byte[])" 
* commit '1db7a31a45c234eb18bd788264591859bee64815':
  Add BluetoothAdapter.getRemoteDevice(byte[])
 2011-12-09 14:38:10 -08:00
Nick Pelly
5eb47e45f4 am 8c9d0139: Merge "Fix BasicNfcEeTest java package." 
* commit '8c9d01391cd257dce65928b462b32df24eb38b82':
  Fix BasicNfcEeTest java package.
 2011-12-09 14:38:08 -08:00
Nick Pelly
1db7a31a45 Merge "Add BluetoothAdapter.getRemoteDevice(byte[])" 2011-12-09 14:37:05 -08:00
Nick Pelly
8c9d01391c Merge "Fix BasicNfcEeTest java package." 2011-12-09 14:36:23 -08:00
Nick Pelly
75596b4545 Add BluetoothAdapter.getRemoteDevice(byte[]) 
This is useful for NFC->BT hand-over, where we are already working with bytes.

Change-Id: I2fff0b4fa0cefe9bfdf9a13f7ec6f557776a8a03
 2011-12-09 14:35:38 -08:00
Nick Pelly
09588f64a2 Fix BasicNfcEeTest java package. 
It was in com.android.nfc_extras, which caused it to get bundled with
com.android.nfc_extras.jar, which caused all kinds of confusion when
trying to push new versions of the test.

It should be in com.android.nfc_extras.tests

Also fix getContext() -> getTargetContext().

Change-Id: I1e3afa150809a3ed8c4f88531f039fe7797aca1d
 2011-12-09 14:35:32 -08:00
Gilles Debunne
6978639980 am 683a485f: am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit '683a485fbcf72caad42f9fd030255f1083ce5637':
  IOOB is Suggestions
 2011-12-09 14:28:40 -08:00
Gilles Debunne
48c5695417 am 47a4b78e: am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '47a4b78eb7c662cc12c68690ff57b4004c39980c':
  Prevent NPE in SuggestionSpan
 2011-12-09 14:28:38 -08:00
Jeff Tinker
3861e1dc25 am aac2f9c6: am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'aac2f9c66ccb181544f822a1af7397a8e25455e7':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-09 14:28:36 -08:00
Jeff Brown
852c83ac93 am bdc18b28: am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit 'bdc18b28eb04b8c8cc00313096f8bfb142e407e3':
  Shortcut keys should be handled on down, not up.
 2011-12-09 14:28:34 -08:00
Jeff Brown
5f37008565 am fa7fa9a5: am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit 'fa7fa9a5ba796eabb2dadb8e2ce1b97da38e939e':
  Fix system hotkey handling.
 2011-12-09 14:28:32 -08:00
Gilles Debunne
683a485fbc am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
  IOOB is Suggestions
 2011-12-09 14:25:55 -08:00
Gilles Debunne
47a4b78eb7 am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
  Prevent NPE in SuggestionSpan
 2011-12-09 14:25:53 -08:00
Jeff Tinker
aac2f9c66c am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-09 14:25:49 -08:00
Jeff Brown
bdc18b28eb am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit '03e634270d880407316b51fac2278e604fc82703':
  Shortcut keys should be handled on down, not up.
 2011-12-09 14:25:41 -08:00
Jeff Brown
fa7fa9a5ba am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit '944c985b4199e6e029568ea87004c9727e469cc0':
  Fix system hotkey handling.
 2011-12-09 14:25:38 -08:00
Jack Palevich
9d4fe1abab am ec3a88de: Merge "Fix convert8To4, convert8To5" 
* commit 'ec3a88dee2c7d77c09eaad0c297f077744033d48':
  Fix convert8To4, convert8To5
 2011-12-09 14:21:22 -08:00
Jack Palevich
ec3a88dee2 Merge "Fix convert8To4, convert8To5" 2011-12-09 14:19:39 -08:00
Jack Palevich
0501f8a913 Fix convert8To4, convert8To5 
See b/5680952 "Compilation warnings in etc1.cpp" for discussion.

Fixes b/5680952

Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
 2011-12-09 14:06:07 -08:00
Irfan Sheriff
d837e370b2 am 1108e8dd: Merge "Change RSSI notification levels to 5 in framework" 
* commit '1108e8ddad3ddf0dbc660229ca3be6de7f600c3a':
  Change RSSI notification levels to 5 in framework
 2011-12-09 12:45:16 -08:00