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

48350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
820caf7b04 am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '8821ba860693f5206c56ae727a4231e4d6f0a735':
  Ummm...  f*, stop breaking the build.
 2011-06-09 16:14:12 -07:00
Dianne Hackborn
8821ba8606 Ummm... f*, stop breaking the build. 
Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40
 2011-06-09 16:09:15 -07:00
Dianne Hackborn
a8d7ea067c am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:02:02 -07:00
Dianne Hackborn
220cd77de6 Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 2011-06-09 15:55:54 -07:00
Robert Greenwalt
75749ab1a0 Merge "Set locale based on SIM preferred language." into honeycomb-LTE 2011-06-09 15:48:16 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
Kazuhiro Ondo
e9b46c3ac5 Set locale based on SIM preferred language. 
Unless user had selected a desired locale, EFli or EFpl will be
used to decide the locale to be used.

Note this locale setting is not persistent - only valid while
SIM card is present.

Change-Id: I1f3945f7bc02624dff94b90e7f1a658a136033e8
 2011-06-09 12:05:26 -07:00
James Dong
2488a94350 am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit 'e3b80c838753fe8c9049950216c6379098465810':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:03:52 -07:00
Mike Lockwood
e502c5364f am b3174c46: UsbService: Fix JNI reference leak 
* commit 'b3174c46ade0be4628813a74b317da538e367bc8':
  UsbService: Fix JNI reference leak
 2011-06-09 12:01:31 -07:00
James Dong
e3b80c8387 Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 2011-06-09 11:56:09 -07:00
Mike Lockwood
b3174c46ad UsbService: Fix JNI reference leak 
http://code.google.com/p/android/issues/detail?id=17365

Change-Id: Ice0174e0db2a785d32ac16694ebf3b7ddb1b7fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-09 14:48:11 -04:00
Justin Ho
9b0a8f9a92 am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit '1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
  Updating default wallpaper of large devices to match xlarge
 2011-06-09 10:22:17 -07:00
Xavier Ducrohet
2e0f711817 am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 10:19:14 -07:00
Justin Ho
1d3173c3dc Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 2011-06-09 10:18:13 -07:00
Xavier Ducrohet
8ee28811ad Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* changes:
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 10:12:40 -07:00
Justin Ho
3116496837 Updating default wallpaper of large devices to match xlarge 
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
 2011-06-09 09:42:22 -07:00
Dianne Hackborn
3aabdeacef am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-08 22:35:25 -07:00
Dianne Hackborn
5ba2e872fa Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 2011-06-08 22:33:34 -07:00
Dianne Hackborn
48a7651823 Fix for not reporting correct "sw" in compat mode. 
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
 2011-06-08 22:26:33 -07:00
Dianne Hackborn
2d618e415f am e22fe933: Fix issue #4582417: Need to add new PackageManager... 
* commit 'e22fe9331ad8a9f81470751fdeca7633f654cffa':
  Fix issue #4582417: Need to add new PackageManager...
 2011-06-08 21:38:33 -07:00
John Wang
08a8f3f9dc Merge "Set emergency call text visibility." into honeycomb-LTE 2011-06-08 20:38:59 -07:00
Dianne Hackborn
e22fe9331a Fix issue #4582417: Need to add new PackageManager... 
...FEATURE_ constant for FAKE_MULTITOUCH in MR2

Change-Id: Ib6950d9dbdd58618aec593de7e0cf1c01b7d6ef9
 2011-06-08 20:38:41 -07:00
Dianne Hackborn
a1396dfe7a am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
 2011-06-08 20:02:43 -07:00
Dianne Hackborn
021408910a Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 2011-06-08 20:00:50 -07:00
John Wang
5328bf0b2e Set emergency call text visibility. 
Set emergency call text visibility based on
emergencyCallCapable config for sim missing
and networklock screens.

bug:4392059
Change-Id: Ibfe92405ada7b452927940295c090d88ecd79519
 2011-06-08 19:51:57 -07:00
John Wang
735463d1d9 Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE 2011-06-08 19:37:56 -07:00
Mathias Agopian
b40e85f901 am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit '645434fb4eff408698423d70904fb8fc709a5225':
  Fix a leak in RefBase
 2011-06-08 19:30:47 -07:00
Mathias Agopian
645434fb4e Merge "Fix a leak in RefBase" into honeycomb-mr2 2011-06-08 19:28:39 -07:00
Jim Miller
b0cdc2baa5 Fix layout issue on Xoom when device thinks there's a SIM. 
bug:4411799
Change-Id: I2c7deff557bcd226444730401c8347ea3d6cab56
 2011-06-08 18:48:58 -07:00
Dianne Hackborn
5fd2169eab Work on issue #4518815: Compatibility mode introduces compatibility regression... 
...for Market App iRunner

There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components.  This addresses everything
I could find.

Unfortunately it does *not* fix this particular app.  I am starting to think this
is just an issue in the app.  This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.

Also a few changes here and there to get rid of $#*&^!! debug logs.

Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
 2011-06-08 18:45:43 -07:00
Xavier Ducrohet
45b662e1bc Merge 06942bc4 from hc-mr1. 
Layoutlib - use the new getParser callback when possible.

Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
 2011-06-08 17:11:40 -07:00
Xavier Ducrohet
beb5fb622b Merge 988eeeb5 from hc-mr1. 
Support for custom declare-styleable attr with enum/flag in layoutlib.

Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
 2011-06-08 17:10:11 -07:00
Adam Powell
73d54e7b54 am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '4381f6421ca408d1dc66430ddfb107c5011bfe25':
  Public styles for action bar tabs
 2011-06-08 16:58:35 -07:00
Adam Powell
4381f6421c Merge "Public styles for action bar tabs" into honeycomb-mr2 2011-06-08 16:54:50 -07:00
Mathias Agopian
2c0042b666 Fix a leak in RefBase 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Id85e749ba04521199555dd701198edd097c313d4
 2011-06-08 16:25:01 -07:00
Adam Powell
1a4678b93f Public styles for action bar tabs 
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
 2011-06-08 15:13:50 -07:00
Wink Saville
799f04c09c Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 2011-06-08 15:00:46 -07:00
Wink Saville
33e1424b2e Merge "Use CSIM to get provision information" into honeycomb-LTE 2011-06-08 14:58:53 -07:00
John Wang
fe682fd74d am cea03df2: Do not merge. Return null id for Non-phone device. 
* commit 'cea03df201dc6659654234bc5fbfebf1b6a06e42':
  Do not merge. Return null id for Non-phone device.
 2011-06-08 13:52:26 -07:00
Jeff Brown
5f0b1721ee am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 
* commit '25bd8abce993e17b382ea5c29a1cb68dd095cf45':
  Fix swipe gesture cosine calculation. Bug: 4124987
 2011-06-08 13:52:22 -07:00
John Wang
cea03df201 Do not merge. Return null id for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-08 13:10:22 -07:00
Kazuhiro Ondo
2e994586ed Report data status from ApnContext even if data is detached 
While in HO, data connection type may temporary become "unknown".
This triggers TelephonyRegistry picks up the wrong data connection
state, ending up notifying bogus state to ConnectivityService.

The patch is just to pick up the status from ApnContext which
should be maintaining the right state. Also cleaned up unnecessary
lines which was added earlier phase.

Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
 2011-06-08 13:05:32 -07:00
Kazuhiro Ondo
53f67f7e9d Use CSIM to get provision information 
In case of LTE & CDMA hybrid system, provision information will be
read from CSIM records.

Also CSIM records can be updated over the air. No data connection
attempt should be made until CSIM provisioning is notified
via SIM_REFRESH event.

Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
 2011-06-08 12:59:22 -07:00
Wink Saville
a558fdf156 Merge "Fix default preferred network." into honeycomb-LTE 2011-06-08 12:56:27 -07:00
Wink Saville
d6bcfd1cd0 Fix default preferred network. 
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
 2011-06-08 12:18:07 -07:00
Jeff Brown
25bd8abce9 Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 2011-06-07 16:58:06 -07:00
Jeff Brown
6674d9bf0a Fix swipe gesture cosine calculation. 
Bug: 4124987

Recent changes introduced a multiplication factor into the
distance calculation which ended up being absent from the
dot product calculation.

Change-Id: Ia367912b9ac09b6285d5a498a0c271563c9e9e39
 2011-06-07 16:50:14 -07:00
Adam Powell
7ed8ff18ce am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 
* commit '68b81434963db90e0d5b14710e4edd86084ede3c':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
 2011-06-07 16:22:32 -07:00
Adam Powell
68b8143496 Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 2011-06-07 16:19:26 -07:00
Adam Powell
982cb98393 Fix bug 4533120 - rough handling of invalid event streams in 
ScaleGestureDetector

Make ScaleGestureDetector a bit more tolerant of bogus event streams.

Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
 2011-06-07 16:13:51 -07:00