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

64569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Hamby
36b8c2e682 am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit '555fe79cdf037e7250f04591e60ecc8cff0cb95e':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-12 12:35:09 -08:00
Romain Guy
6752d0ab02 Mark color uniform fetched after fetching it 
Change-Id: I10e8027018608070a536eb8b51c7a4272e37006c
 2011-12-12 12:15:17 -08:00
Matthew Xie
18ad6514bb am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 
* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
 2011-12-12 12:09:13 -08:00
Matthew Xie
ed0830c502 Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 2011-12-12 12:07:39 -08:00
Romain Guy
11326aa1b9 Merge "Code cleanup" 2011-12-12 11:44:43 -08:00
Romain Guy
ee698a01bd Merge "Free up resources by deleting shaders early on" 2011-12-12 11:44:32 -08:00
Matthew Xie
2d789e58a8 Move broadcastState STATE_TURNING_ON before persistSwitchSetting 
CTS test revealed that persistSwitchSetting could take more than 1 second.
STATE_TURNING_ON intent missed the test timing. We move the broadcast
before persistSwitchSetting
bug 5740715

Change-Id: I54a0a0afc8d1c4fc28f84e6122809af2f1456ca7
 2011-12-12 11:36:18 -08:00
Eric Fischer
f3ea02319f am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '386f208489d85d81755b64e92a84290953accfc0':
  Import revised translations.  DO NOT MERGE
 2011-12-12 11:06:38 -08:00
Eric Fischer
386f208489 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-12 11:04:39 -08:00
Eric Fischer
c1e2aca598 Import revised translations. DO NOT MERGE 
Change-Id: Ia118056259f828ff913d8a9bf2bc3a8fa2c54f9c
 2011-12-12 10:59:11 -08:00
Amith Yamasani
79727e2f11 am 549d5f88: Merge "Show the current stream\'s volume in the volume panel." 
* commit '549d5f88bf96f93de5d10f094bda4a62ac5ebe3a':
  Show the current stream's volume in the volume panel.
 2011-12-12 09:57:42 -08:00
Amith Yamasani
549d5f88bf Merge "Show the current stream's volume in the volume panel." 2011-12-12 09:56:26 -08:00
Andreas Huber
ea53e965bf am 2fc93533: Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" 
* commit '2fc93533d2689d510c93931bc02ad602fa0e46f2':
  Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler
 2011-12-12 08:33:48 -08:00
Andreas Huber
2fc93533d2 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" 2011-12-12 08:32:28 -08:00
The Android Open Source Project
40375099d1 Reconcile with ics-mr1-release 
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
 2011-12-12 07:59:17 -08:00
The Android Open Source Project
f14dc29104 Merge from ics-mr1 
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
 2011-12-12 07:47:43 -08:00
Ben Murdoch
7a6f31d164 am 2ff8cc24: Merge "Clear the WebView picture when a new load starts." 
* commit '2ff8cc2438866f791d8fe888573b5fba103e2cd0':
  Clear the WebView picture when a new load starts.
 2011-12-12 03:24:34 -08:00
Ben Murdoch
2ff8cc2438 Merge "Clear the WebView picture when a new load starts." 2011-12-12 03:13:46 -08:00
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
Raphael
7c3bef85da Merge "AAPT fix printf %zd crash on Windows". Do not merge. 
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Bug: 5742142

(cherry picked from commit f51125d8429ffa71c57ba6fbdca9effc72642a9b)

Change-Id: I7545734ce8ce4a1f3e95f8a255daa8a909f870a1
 2011-12-11 13:59:02 -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
Jeff Tinker
a5cbf023e3 Fix drm enumeration order, resolves failure to play forward lock ringtones 
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466
 2011-12-09 20:04:17 -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
Robert Greenwalt
bb4fd0b444 Use the carrier-given dns addrs for tethering. 
This fixes a complaint from carriers (that we used 8.8.8.8), but also
fixes the case where there is only room for one live radio
connection: the secondary connection (tethering) doesn't have a
default route to prevent on-device traffic from slipping out on the
tethering connection, but tethered dns is proxied through dnsmasq, so
it is appearing as on-device traffic and is unroutable.  By switching
to the carrier-indicated dns servers we can use the host-routes
already set for those and kill two bugs with one fix.

bug:5525764
bug:3045311
Change-Id: Ib1ccea81e0c0ed2d1462dc9721c2647124a790da
 2011-12-09 17:12:03 -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
The Android Automerger
c721ba76a4 merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 16:17:04 -08:00
Justin Ho
df83cfc95c am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit '1cec30a182c1963beda4b6f11cfae9fa38061e68':
  Quick settings icons updated to match ics style on tablet
 2011-12-09 15:43:48 -08:00
Justin Ho
1cec30a182 Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 2011-12-09 15:42:10 -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
Amith Yamasani
b066fcc0d8 Dump system and secure settings in bugreport. 
Change-Id: I19b7bf83c160b1bd5ce79e64886a9a76b91217b3
 2011-12-09 15:22:39 -08:00
Andreas Huber
9f62e15f40 Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler 
contributed by Samsung (untested).

Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
 2011-12-09 15:09:56 -08:00
Jamie Gennis
798b9cdf8c SurfaceTexture: fix a verbose-log compile error 
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
 2011-12-09 15:07:44 -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