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

82764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
a2adaf27ce am bec1d13d: Merge "Make generic BaseNetworkObserver." into jb-mr1-dev 
* commit 'bec1d13da2ef3c8c2c4cc4f740474d095068bd8b':
  Make generic BaseNetworkObserver.
 2012-08-05 15:00:25 -07:00
Jeff Sharkey
bec1d13da2 Merge "Make generic BaseNetworkObserver." into jb-mr1-dev 2012-08-05 14:58:13 -07:00
Jeff Sharkey
5d94595889 am 9c5c6595: Merge "Make LocalSocket Closeable." into jb-mr1-dev 
* commit '9c5c65959790bdceda384f87cf457bc7f9c2d433':
  Make LocalSocket Closeable.
 2012-08-05 14:57:41 -07:00
Jeff Sharkey
9c5c659597 Merge "Make LocalSocket Closeable." into jb-mr1-dev 2012-08-05 14:55:28 -07:00
Jeff Sharkey
216c181e76 Make generic BaseNetworkObserver. 
This makes it easier to add new INetworkManagementEventObserver events
in future.

Change-Id: I432263d745558de4b878f313c1951230ed9db2b1
 2012-08-05 14:32:41 -07:00
Jeff Sharkey
065b299df4 Make LocalSocket Closeable. 
Enables usage of IoUtils.closeQuietly().

Change-Id: I91126297c1f235ae9da09f82d8f4f22db46558eb
 2012-08-05 14:21:07 -07:00
Wink Saville
5775e5e1d0 am fe33a09a: am 8f82961f: am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony" 
* commit 'fe33a09a3f0d53bf96f7c65bfeb271d6487012e1':
  Telephony: Move AdnRecord.aidl into opt/telephony
 2012-08-04 08:15:08 -07:00
Wink Saville
3d62c325fe am bb01fd01: am 1971df5d: am e20a19cb: Merge "show 3G icon for CDMA/1xRTT" 
* commit 'bb01fd01118d34d5f91c83881b0bf95dd74d6159':
  show 3G icon for CDMA/1xRTT
 2012-08-04 08:15:05 -07:00
Wink Saville
fe33a09a3f am 8f82961f: am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony" 
* commit '8f82961f5ace376cb2f888f8d4e53fe8a49f7315':
  Telephony: Move AdnRecord.aidl into opt/telephony
 2012-08-04 08:12:52 -07:00
Wink Saville
bb01fd0111 am 1971df5d: am e20a19cb: Merge "show 3G icon for CDMA/1xRTT" 
* commit '1971df5d4296f077cccff704201057a32b733235':
  show 3G icon for CDMA/1xRTT
 2012-08-04 08:12:48 -07:00
Wink Saville
8f82961f5a am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony" 
* commit '98853623bcb27155e9b030301a0cb2a987cfc612':
  Telephony: Move AdnRecord.aidl into opt/telephony
 2012-08-04 08:07:54 -07:00
Wink Saville
1971df5d42 am e20a19cb: Merge "show 3G icon for CDMA/1xRTT" 
* commit 'e20a19cb541f8621f04be0f3d3501f2fc51a0e82':
  show 3G icon for CDMA/1xRTT
 2012-08-04 08:07:49 -07:00
Wink Saville
98853623bc Merge "Telephony: Move AdnRecord.aidl into opt/telephony" 2012-08-04 07:54:35 -07:00
Wink Saville
e20a19cb54 Merge "show 3G icon for CDMA/1xRTT" 2012-08-04 07:51:27 -07:00
Craig Mautner
0558c161bc am b49a065d: Fix build with density methods. 
* commit 'b49a065d9904567624a088857ecd1626fad91511':
  Fix build with density methods.
 2012-08-03 19:11:40 -07:00
Craig Mautner
b49a065d99 Fix build with density methods. 
Change-Id: I95c0a4f12db40f200a3a004394763beaef904232
 2012-08-03 19:03:24 -07:00
Craig Mautner
89020454b6 am cbb6b41a: Merge "Do not use last app rotation as default." into jb-mr1-dev 
* commit 'cbb6b41aeff9d70bee30ac670237e45b35689cc0':
  Do not use last app rotation as default.
 2012-08-03 18:11:40 -07:00
Craig Mautner
cbb6b41aef Merge "Do not use last app rotation as default." into jb-mr1-dev 2012-08-03 18:07:52 -07:00
Raph Levien
d7306c05b2 am b79413e9: Merge "Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev 
* commit 'b79413e92d46b9d12b628a60e1cefa2e34ab9d3d':
  Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details
 2012-08-03 18:03:37 -07:00
Raph Levien
b79413e92d Merge "Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev 2012-08-03 18:00:53 -07:00
Romain Guy
a01fdc1db4 am da806b5c: Merge "Bowing my head in shame Bug #6924514" into jb-mr1-dev 
* commit 'da806b5c5fb804328d9de06e998b76dc00a8b223':
  Bowing my head in shame Bug #6924514
 2012-08-03 17:48:57 -07:00
Dianne Hackborn
e1fdc79ba2 am 2e5746a7: Merge "We can now (kind-of) change screen density on the fly." into jb-mr1-dev 
* commit '2e5746a7a807c6d9d61af48978695214ef9d6717':
  We can now (kind-of) change screen density on the fly.
 2012-08-03 17:48:53 -07:00
Romain Guy
da806b5c5f Merge "Bowing my head in shame Bug #6924514" into jb-mr1-dev 2012-08-03 17:46:27 -07:00
Dianne Hackborn
2e5746a7a8 Merge "We can now (kind-of) change screen density on the fly." into jb-mr1-dev 2012-08-03 17:45:52 -07:00
Romain Guy
8801b2fef3 Bowing my head in shame 
Bug #6924514

Change-Id: Ifcc08fb5dbaf3f9c6ac3a3e618db2fd6349dc290
 2012-08-03 17:43:31 -07:00
Dianne Hackborn
dde331cebd We can now (kind-of) change screen density on the fly. 
Preloaded drawables now have a density associated with them, so we
can load the correct drawable if we are using a different density.

Window manager now formally keeps track of the density for each
screen, allowing it to be overridden like you can already do with
size, and relies on this density to drive itself internally and
the configurations it reports.

There are a new set of Bitmap constructors where you provide a
DisplayMetrics so they can be constructed with the correct density.
(This will be for when you can have different windows in the same
app running at different densities.)

ActivityThread now watches for density changes, and pushes them
to the DENSITY_DEVICE and Bitmap global density values for that
process.

A new am command allows you to change the density.
 2012-08-03 17:27:29 -07:00
Romain Guy
06a2680bd7 am c0921191: Use correct color for default holo gradient 
* commit 'c09211911c28795354f7ce5a1b75b13ac6a7b4d0':
  Use correct color for default holo gradient
 2012-08-03 17:23:43 -07:00
Romain Guy
c09211911c Use correct color for default holo gradient 
Change-Id: I7976c8d986da69dd312fe28cc6d88fc896bdf926
 2012-08-03 17:21:04 -07:00
Alex Yakavenka
7b3b02cb53 Telephony: Move AdnRecord.aidl into opt/telephony 
Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
 2012-08-03 16:47:51 -07:00
Romain Guy
52a42219fd am 5e80cacf: Replace stretched background textures with real gradients 
* commit '5e80cacfad7a09aea9e255fc7b5bfeb30989d1a8':
  Replace stretched background textures with real gradients
 2012-08-03 16:23:50 -07:00
Romain Guy
5e80cacfad Replace stretched background textures with real gradients 
Change-Id: I320733aaef191318d32fa823d9a6140585f49417
 2012-08-03 16:17:14 -07:00
Romain Guy
56a5205a40 am 18edb811: Avoid crash when dumping display lists 
* commit '18edb81172daa9b98b53d226d94fc03249b1aded':
  Avoid crash when dumping display lists
 2012-08-03 16:17:05 -07:00
Romain Guy
18edb81172 Avoid crash when dumping display lists 
We recently changed the drawText implementation to accept more parameters
which were not taken into account during a dump operation.

Change-Id: Ia1dc682dc7bb2bb02a1f4a514ed5af5556f92a97
 2012-08-03 16:08:56 -07:00
Craig Mautner
4bd149ef83 Do not use last app rotation as default. 
If the rotation sensor has been disabled we were substituting the
last app rotation for the sensor value. This fix uses the last
sensor value delivered before the sensor was disabled. Only use
the last app rotation if we never have received a valid sensor
value.

Fixes bug 6387946.

Change-Id: I50743c30ee2b4455e9848d3a619809be97eec3c8
 2012-08-03 14:47:24 -07:00
Raph Levien
4c7a4a7767 Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details 
The wrong constant was used to count the number of user activity types.
The number of types changed recently, so before then nothing bad
happened. Now we get an AIOOB.

This is the change to NUM_USER_ACTIVITY_TYPES:

Change-Id: I05045180129b30fa09fe5f5e1e3b0ac25fee23b4
https://googleplex-android-review.googlesource.com/#/c/211982/
 2012-08-03 14:37:15 -07:00
Ying Wang
018fda41ec am b92edf99: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b92edf99ef268fe0fd76445286d720bd11f967d2':
  Import translations. DO NOT MERGE
 2012-08-03 14:35:51 -07:00
Ying Wang
b92edf99ef Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-03 14:31:40 -07:00
Dianne Hackborn
42ada11001 am 440f3871: Merge "Fix issue #6921726: Prime: Cannot make or receive phone calls..." into jb-mr1-dev 
* commit '440f38711d59857d57a0e44a6b5b482fd1f49168':
  Fix issue #6921726: Prime: Cannot make or receive phone calls...
 2012-08-03 14:14:37 -07:00
Dianne Hackborn
440f38711d Merge "Fix issue #6921726: Prime: Cannot make or receive phone calls..." into jb-mr1-dev 2012-08-03 14:11:36 -07:00
Dianne Hackborn
f1c0aeda25 Fix issue #6921726: Prime: Cannot make or receive phone calls... 
[NPE at android.graphics.drawable.Drawable.createFromResourceStream]

Change-Id: I223428ffb39e883518aad817227f32851ea18aec
 2012-08-03 14:04:30 -07:00
The Android Open Source Project
65e02b76f7 Reconcile with jb-mr1-release - do not merge 
Change-Id: Id4ed97d910fb1a57271ac4dd2ba530e047242003
 2012-08-03 13:56:30 -07:00
The Android Open Source Project
7ca69a7393 am 7c927b1b: am 633233bc: (-s ours) Reconcile with jb-release - do not merge 
* commit '7c927b1b04edbab435af1618901794d60d09313e':
  Fix NPE on some phones at startup.
  Fix 6804479: "Emergency calls only" in notification shade
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
 2012-08-03 13:28:53 -07:00
The Android Open Source Project
7c927b1b04 am 633233bc: (-s ours) Reconcile with jb-release - do not merge 
* commit '633233bc9ec0f3961b096fea933ecaa454214fd7':
  Fix NPE on some phones at startup.
  Fix 6804479: "Emergency calls only" in notification shade
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
 2012-08-03 13:26:58 -07:00
The Android Open Source Project
633233bc9e Reconcile with jb-release - do not merge 
Change-Id: I586debc586c0de8fc24359daa40cbee9e58340ab
 2012-08-03 13:23:27 -07:00
Ying Wang
a6216c67da Import translations. DO NOT MERGE 
Change-Id: I96086039ac5b62a7a137990de380c95913e17f0f
Auto-generated-cl: translation import
 2012-08-03 12:20:06 -07:00
Martijn Coenen
64f949e309 am 1094b7d7: Merge "Bluetooth: fix enableNoAutoConnect() call." into jb-mr1-dev 
* commit '1094b7d7699738be3193f5be8c451ea4c85461aa':
  Bluetooth: fix enableNoAutoConnect() call.
 2012-08-03 12:14:45 -07:00
Martijn Coenen
1094b7d769 Merge "Bluetooth: fix enableNoAutoConnect() call." into jb-mr1-dev 2012-08-03 12:12:11 -07:00
The Android Open Source Project
0e51c94c98 Reconcile AOSP and GOOG jb-release 
Change-Id: I2cee4571848de79427356a6fcfe8da59ae34e70f
 2012-08-03 12:11:54 -07:00
Jeff Sharkey
72f2a09430 am 0b24b1d3: Merge "Pass changed NetworkInfo to LocationProvider." into jb-mr1-dev 
* commit '0b24b1d37a955a0674a31d4da9ee1d0357a1d7f8':
  Pass changed NetworkInfo to LocationProvider.
 2012-08-03 11:59:01 -07:00
Jeff Sharkey
0b24b1d37a Merge "Pass changed NetworkInfo to LocationProvider." into jb-mr1-dev 2012-08-03 11:56:03 -07:00