Daniel Sandler
650ff92dc5
am 4d3190a8: am f6a34124: Move lots of layout-port/ resources to layout/ .
...
* commit '4d3190a849306a5f3be9ccfde5fca2a78c9e0ee8':
Move lots of layout-port/ resources to layout/ .
2012-08-06 12:35:55 -07:00
Daniel Sandler
4d3190a849
am f6a34124: Move lots of layout-port/ resources to layout/ .
...
* commit 'f6a341248d65a5637445941bc320f27673496f71':
Move lots of layout-port/ resources to layout/ .
2012-08-06 12:34:30 -07:00
Daniel Sandler
f6a341248d
Move lots of layout-port/ resources to layout/ .
...
The framework is no longer letting us skate by without a
default (unqualified) for of each resource; in particular,
the land/port aspect of the configuration appears to be
binding much later than it used to.
Bug: 6937365
Change-Id: I6bf72c76e707548168fefa9466dc196ffde33ab3
2012-08-06 15:29:09 -04:00
Elliott Hughes
db9d339d4b
Merge "Use ICU's CLDR data for "AM" and "PM" strings."
2012-08-06 09:40:32 -07:00
Jeff Sharkey
72cf2a995c
am a2adaf27: am bec1d13d: Merge "Make generic BaseNetworkObserver." into jb-mr1-dev
...
* commit 'a2adaf27cee87cd2f0bf714d38c366f41945a799':
Make generic BaseNetworkObserver.
2012-08-05 15:02:22 -07:00
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
cbc1a8c40f
am 5d945958: am 9c5c6595: Merge "Make LocalSocket Closeable." into jb-mr1-dev
...
* commit '5d94595889071d84b6d0b6517656f298a4153a09':
Make LocalSocket Closeable.
2012-08-05 14:59:41 -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
0d6842985b
am 5775e5e1: am fe33a09a: am 8f82961f: am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
...
* commit '5775e5e1d0a6803cee37ea8bd6a145d6c1487317':
Telephony: Move AdnRecord.aidl into opt/telephony
2012-08-04 08:17:25 -07:00
Wink Saville
bd2ebfb377
am 3d62c325: am bb01fd01: am 1971df5d: am e20a19cb: Merge "show 3G icon for CDMA/1xRTT"
...
* commit '3d62c325fefbfc6d810ed30db4fd000b35332c50':
show 3G icon for CDMA/1xRTT
2012-08-04 08:17:21 -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
0f59194cd9
am 0558c161: am b49a065d: Fix build with density methods.
...
* commit '0558c161bcf3b728185df299d7eb271ace9d2432':
Fix build with density methods.
2012-08-03 19:14:18 -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
2f4ac21482
am 89020454: am cbb6b41a: Merge "Do not use last app rotation as default." into jb-mr1-dev
...
* commit '89020454b6541110f9dd6c5f9e642f24d596b1c4':
Do not use last app rotation as default.
2012-08-03 18:13:55 -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
9d5bcfe69b
am d7306c05: am b79413e9: Merge "Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev
...
* commit 'd7306c05b28438f78478049d7c44d96e278eced4':
Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details
2012-08-03 18:05:41 -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
b1bdc7454a
am a01fdc1d: am da806b5c: Merge "Bowing my head in shame Bug #6924514 " into jb-mr1-dev
...
* commit 'a01fdc1db4a727b13fa7e263fed4225a36f71fc7':
Bowing my head in shame Bug #6924514
2012-08-03 17:51:01 -07:00
Dianne Hackborn
c5f61b7325
am e1fdc79b: am 2e5746a7: Merge "We can now (kind-of) change screen density on the fly." into jb-mr1-dev
...
* commit 'e1fdc79ba2ab32bb084b193d187df1fa8b769e86':
We can now (kind-of) change screen density on the fly.
2012-08-03 17:50:57 -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
357a4e87c1
am 06a2680b: am c0921191: Use correct color for default holo gradient
...
* commit '06a2680bd7d33047bc71f166c8f18bfb7443e22e':
Use correct color for default holo gradient
2012-08-03 17:26:55 -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
2e902bc148
am 52a42219: am 5e80cacf: Replace stretched background textures with real gradients
...
* commit '52a42219fd285b56769f493902a5e4fced5b5d33':
Replace stretched background textures with real gradients
2012-08-03 16:26:03 -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
c9d13176f1
am 56a5205a: am 18edb811: Avoid crash when dumping display lists
...
* commit '56a5205a4012b305fd165a9473ce85314b027c55':
Avoid crash when dumping display lists
2012-08-03 16:19:16 -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