OSDN Git Service
Dianne Hackborn [Tue, 14 Jun 2011 18:38:01 +0000 (11:38 -0700)]
am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
700a1f25719138b94c453beb6325e627a11a9883':
Update resources documentation with new qualifiers.
Dianne Hackborn [Tue, 14 Jun 2011 18:36:05 +0000 (11:36 -0700)]
am
c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '
c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
Add new landscape and portrait orientation features.
Dianne Hackborn [Tue, 14 Jun 2011 18:27:09 +0000 (11:27 -0700)]
Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 18:24:29 +0000 (11:24 -0700)]
Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 02:33:22 +0000 (19:33 -0700)]
Add new landscape and portrait orientation features.
Updates aapt to know about these. Also updates aapt badging to:
- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.
Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
Dianne Hackborn [Tue, 14 Jun 2011 05:01:13 +0000 (22:01 -0700)]
Update resources documentation with new qualifiers.
Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
John Wang [Mon, 13 Jun 2011 23:17:39 +0000 (16:17 -0700)]
Update sim missing message in lock screen.
Update SIM missing message to include SIM corrupted situation.
bug:
4392059
Change-Id: Icf2f8d801a2e2761a309442209118a6a71a4c633
Mathias Agopian [Mon, 13 Jun 2011 21:13:21 +0000 (14:13 -0700)]
am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Mathias Agopian [Mon, 13 Jun 2011 01:05:53 +0000 (18:05 -0700)]
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Bug:
4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
Dianne Hackborn [Sat, 11 Jun 2011 01:39:48 +0000 (18:39 -0700)]
am
fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
* commit '
fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6':
Fix some problems with moving in and out of detached state.
Dianne Hackborn [Sat, 11 Jun 2011 01:37:22 +0000 (18:37 -0700)]
Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
Dianne Hackborn [Sat, 11 Jun 2011 00:03:42 +0000 (17:03 -0700)]
Fix some problems with moving in and out of detached state.
Loaders were not being re-initialized correctly when coming back
(this would also impact the back stack). The ListView also wasn't
working correctly, and there were also problems with simply
re-using a Fragment instance after it had been removed.
Change-Id: I534b091ae09c0ef7ffffe9d68049e6840e8926b3
Jim Miller [Sat, 11 Jun 2011 00:41:20 +0000 (17:41 -0700)]
am
8daefb9c: Fix layout issue on table when device thinks there\'s a SIM.
* commit '
8daefb9c63cce5e0a87ba38c40dd4f48be3809e1':
Fix layout issue on table when device thinks there's a SIM.
John Wang [Sat, 11 Jun 2011 00:19:42 +0000 (17:19 -0700)]
Merge "Add toString for IccCard Status and App." into honeycomb-LTE
Jim Miller [Sat, 21 May 2011 00:11:04 +0000 (17:11 -0700)]
Fix layout issue on table when device thinks there's a SIM.
bug:
4411799
Change-Id: I9d9ef036d4cf424ed760e0db157bb1f020b7c678
Teng-Hui Zhu [Fri, 10 Jun 2011 21:22:52 +0000 (14:22 -0700)]
am
90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit '
90bdb69bf95e5865547a55260dd61744b0bcc911':
fix one NPE when webChromeClient don't have progress view support
Teng-Hui Zhu [Fri, 10 Jun 2011 21:19:22 +0000 (14:19 -0700)]
Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2
Robert Greenwalt [Fri, 10 Jun 2011 21:08:28 +0000 (14:08 -0700)]
Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
Teng-Hui Zhu [Fri, 10 Jun 2011 17:56:33 +0000 (10:56 -0700)]
fix one NPE when webChromeClient don't have progress view support
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
Dianne Hackborn [Fri, 10 Jun 2011 02:26:25 +0000 (19:26 -0700)]
am
2bb2d48f: Commit final (maybe) MR 2 API.
* commit '
2bb2d48f9ca1726b8de957ec7ea321c767409c12':
Commit final (maybe) MR 2 API.
Dianne Hackborn [Fri, 10 Jun 2011 02:22:05 +0000 (19:22 -0700)]
Commit final (maybe) MR 2 API.
Change-Id: I42f72819a29d4ac7902b7be5af0b5d353d790eae
John Wang [Thu, 9 Jun 2011 22:42:58 +0000 (15:42 -0700)]
Add toString for IccCard Status and App.
Enhance the debug info for GET_SIM_STATUS. Print out the
Card status and App status instead of Object id. It helps
to debug PUK lock and other SIM related issues.
Change-Id: I489f3933529a9719827a8799c41de8e999db6b40
Dianne Hackborn [Fri, 10 Jun 2011 00:40:08 +0000 (17:40 -0700)]
Dianne Hackborn [Fri, 10 Jun 2011 00:27:05 +0000 (17:27 -0700)]
Quiet the log.
Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
Dianne Hackborn [Fri, 10 Jun 2011 00:28:00 +0000 (17:28 -0700)]
am
f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit '
f795e9a86d4f62e5314ef95978c3ea17d90975db':
Okay *now* really enforce the limit on non-public styles.
Kazuhiro Ondo [Sat, 4 Jun 2011 03:30:20 +0000 (22:30 -0500)]
CDMALTE: Get roaming status based on SID/NID
Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
Dianne Hackborn [Thu, 9 Jun 2011 23:17:53 +0000 (16:17 -0700)]
Okay *now* really enforce the limit on non-public styles.
Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae
Dianne Hackborn [Thu, 9 Jun 2011 23:14:12 +0000 (16:14 -0700)]
am
8821ba86: Ummm... f*, stop breaking the build.
* commit '
8821ba860693f5206c56ae727a4231e4d6f0a735':
Ummm... f*, stop breaking the build.
Dianne Hackborn [Thu, 9 Jun 2011 18:29:08 +0000 (11:29 -0700)]
Ummm... f*, stop breaking the build.
Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40
Dianne Hackborn [Thu, 9 Jun 2011 23:02:02 +0000 (16:02 -0700)]
am
220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit '
220cd77de62956eb76c5084e1d1341d69bfd214a':
Enforce public resource restriction on bag parents.
Dianne Hackborn [Thu, 9 Jun 2011 22:55:54 +0000 (15:55 -0700)]
Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
Robert Greenwalt [Thu, 9 Jun 2011 22:48:16 +0000 (15:48 -0700)]
Merge "Set locale based on SIM preferred language." into honeycomb-LTE
Dianne Hackborn [Thu, 9 Jun 2011 18:29:08 +0000 (11:29 -0700)]
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
Kazuhiro Ondo [Tue, 7 Jun 2011 15:45:49 +0000 (10:45 -0500)]
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
James Dong [Thu, 9 Jun 2011 19:03:52 +0000 (12:03 -0700)]
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."
Mike Lockwood [Thu, 9 Jun 2011 19:01:31 +0000 (12:01 -0700)]
am
b3174c46: UsbService: Fix JNI reference leak
* commit '
b3174c46ade0be4628813a74b317da538e367bc8':
UsbService: Fix JNI reference leak
James Dong [Thu, 9 Jun 2011 18:56:09 +0000 (11:56 -0700)]
Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
Mike Lockwood [Thu, 9 Jun 2011 18:48:11 +0000 (14:48 -0400)]
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>
Justin Ho [Thu, 9 Jun 2011 17:22:17 +0000 (10:22 -0700)]
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
Xavier Ducrohet [Thu, 9 Jun 2011 17:19:14 +0000 (10:19 -0700)]
am
8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '
8ee28811ad208d224ac8d317e4644aabc9ffb886':
Merge
06942bc4 from hc-mr1.
Merge
988eeeb5 from hc-mr1.
Justin Ho [Thu, 9 Jun 2011 17:18:13 +0000 (10:18 -0700)]
Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
Xavier Ducrohet [Thu, 9 Jun 2011 17:12:40 +0000 (10:12 -0700)]
Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* changes:
Merge
06942bc4 from hc-mr1.
Merge
988eeeb5 from hc-mr1.
Justin Ho [Thu, 9 Jun 2011 16:42:22 +0000 (09:42 -0700)]
Updating default wallpaper of large devices to match xlarge
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
Dianne Hackborn [Thu, 9 Jun 2011 05:35:25 +0000 (22:35 -0700)]
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.
Dianne Hackborn [Thu, 9 Jun 2011 05:33:34 +0000 (22:33 -0700)]
Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
Dianne Hackborn [Thu, 9 Jun 2011 04:51:44 +0000 (21:51 -0700)]
Fix for not reporting correct "sw" in compat mode.
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
Dianne Hackborn [Thu, 9 Jun 2011 04:38:33 +0000 (21:38 -0700)]
am
e22fe933: Fix issue #
4582417: Need to add new PackageManager...
* commit '
e22fe9331ad8a9f81470751fdeca7633f654cffa':
Fix issue #
4582417: Need to add new PackageManager...
John Wang [Thu, 9 Jun 2011 03:38:59 +0000 (20:38 -0700)]
Merge "Set emergency call text visibility." into honeycomb-LTE
Dianne Hackborn [Thu, 9 Jun 2011 03:24:29 +0000 (20:24 -0700)]
Fix issue #
4582417: Need to add new PackageManager...
...FEATURE_ constant for FAKE_MULTITOUCH in MR2
Change-Id: Ib6950d9dbdd58618aec593de7e0cf1c01b7d6ef9
Dianne Hackborn [Thu, 9 Jun 2011 03:02:43 +0000 (20:02 -0700)]
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...
Dianne Hackborn [Thu, 9 Jun 2011 03:00:50 +0000 (20:00 -0700)]
Merge "Work on issue #
4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
John Wang [Thu, 9 Jun 2011 02:33:56 +0000 (19:33 -0700)]
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
John Wang [Thu, 9 Jun 2011 02:37:56 +0000 (19:37 -0700)]
Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE
Mathias Agopian [Thu, 9 Jun 2011 02:30:47 +0000 (19:30 -0700)]
am
645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
* commit '
645434fb4eff408698423d70904fb8fc709a5225':
Fix a leak in RefBase
Mathias Agopian [Thu, 9 Jun 2011 02:28:39 +0000 (19:28 -0700)]
Merge "Fix a leak in RefBase" into honeycomb-mr2
Jim Miller [Sat, 21 May 2011 00:11:04 +0000 (17:11 -0700)]
Fix layout issue on Xoom when device thinks there's a SIM.
bug:
4411799
Change-Id: I2c7deff557bcd226444730401c8347ea3d6cab56
Dianne Hackborn [Tue, 7 Jun 2011 21:09:47 +0000 (14:09 -0700)]
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
Xavier Ducrohet [Wed, 8 Jun 2011 00:48:35 +0000 (17:48 -0700)]
Merge
06942bc4 from hc-mr1.
Layoutlib - use the new getParser callback when possible.
Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
Xavier Ducrohet [Wed, 8 Jun 2011 00:03:10 +0000 (17:03 -0700)]
Merge
988eeeb5 from hc-mr1.
Support for custom declare-styleable attr with enum/flag in layoutlib.
Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
Adam Powell [Wed, 8 Jun 2011 23:58:35 +0000 (16:58 -0700)]
am
4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
* commit '
4381f6421ca408d1dc66430ddfb107c5011bfe25':
Public styles for action bar tabs
Adam Powell [Wed, 8 Jun 2011 23:54:50 +0000 (16:54 -0700)]
Merge "Public styles for action bar tabs" into honeycomb-mr2
Mathias Agopian [Wed, 8 Jun 2011 23:05:30 +0000 (16:05 -0700)]
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
Adam Powell [Wed, 8 Jun 2011 22:13:50 +0000 (15:13 -0700)]
Public styles for action bar tabs
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
Wink Saville [Wed, 8 Jun 2011 22:00:46 +0000 (15:00 -0700)]
Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
Wink Saville [Wed, 8 Jun 2011 21:58:53 +0000 (14:58 -0700)]
Merge "Use CSIM to get provision information" into honeycomb-LTE
John Wang [Wed, 8 Jun 2011 20:52:26 +0000 (13:52 -0700)]
am
cea03df2: Do not merge. Return null id for Non-phone device.
* commit '
cea03df201dc6659654234bc5fbfebf1b6a06e42':
Do not merge. Return null id for Non-phone device.
Jeff Brown [Wed, 8 Jun 2011 20:52:22 +0000 (13:52 -0700)]
am
25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
* commit '
25bd8abce993e17b382ea5c29a1cb68dd095cf45':
Fix swipe gesture cosine calculation. Bug:
4124987
John Wang [Tue, 7 Jun 2011 22:37:09 +0000 (15:37 -0700)]
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
Kazuhiro Ondo [Sat, 4 Jun 2011 00:13:35 +0000 (19:13 -0500)]
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
Kazuhiro Ondo [Wed, 1 Jun 2011 05:38:42 +0000 (00:38 -0500)]
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
Wink Saville [Wed, 8 Jun 2011 19:56:27 +0000 (12:56 -0700)]
Merge "Fix default preferred network." into honeycomb-LTE
Wink Saville [Wed, 8 Jun 2011 19:18:07 +0000 (12:18 -0700)]
Fix default preferred network.
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.
Some cleanup.
Bug:
4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
Jeff Brown [Tue, 7 Jun 2011 23:58:06 +0000 (16:58 -0700)]
Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 23:50:14 +0000 (16:50 -0700)]
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
Adam Powell [Tue, 7 Jun 2011 23:22:32 +0000 (16:22 -0700)]
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
Adam Powell [Tue, 7 Jun 2011 23:19:26 +0000 (16:19 -0700)]
Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
Adam Powell [Tue, 7 Jun 2011 23:13:08 +0000 (16:13 -0700)]
Fix bug
4533120 - rough handling of invalid event streams in
ScaleGestureDetector
Make ScaleGestureDetector a bit more tolerant of bogus event streams.
Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
John Wang [Tue, 7 Jun 2011 22:49:34 +0000 (15:49 -0700)]
Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
Dianne Hackborn [Tue, 7 Jun 2011 22:47:14 +0000 (15:47 -0700)]
am
a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit '
a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
Remove compat mode dialog.
Dianne Hackborn [Tue, 7 Jun 2011 22:45:14 +0000 (15:45 -0700)]
Merge "Remove compat mode dialog." into honeycomb-mr2
Dianne Hackborn [Tue, 7 Jun 2011 22:44:22 +0000 (15:44 -0700)]
Remove compat mode dialog.
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
Dianne Hackborn [Tue, 7 Jun 2011 22:39:43 +0000 (15:39 -0700)]
am
dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit '
dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
DO NOT MERGE. Experimental compatibility mode UI.
John Wang [Tue, 7 Jun 2011 22:37:09 +0000 (15:37 -0700)]
Make getDeviceId return null 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
Dianne Hackborn [Tue, 7 Jun 2011 22:36:51 +0000 (15:36 -0700)]
Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
Mathias Agopian [Tue, 7 Jun 2011 21:58:02 +0000 (14:58 -0700)]
am
f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
* commit '
f6c8206735e7e078461e5f2aef6e1a1446fdd075':
fix a surface leak introduced by a failed merge (DO NOT MERGE)
Mathias Agopian [Tue, 7 Jun 2011 21:52:22 +0000 (14:52 -0700)]
fix a surface leak introduced by a failed merge (DO NOT MERGE)
Bug:
4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
Daniel Sandler [Tue, 7 Jun 2011 19:29:07 +0000 (15:29 -0400)]
DO NOT MERGE. Experimental compatibility mode UI.
♫ Just another button, for you and me, in the status bar. ♫
(cherry picked from commit
45c0401a0647a5fdc5f37168463c14ad57c5644b)
Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d
Irfan Sheriff [Tue, 7 Jun 2011 20:40:38 +0000 (13:40 -0700)]
Merge "Clear IP configuration on lost network" into honeycomb-LTE
John Wang [Tue, 7 Jun 2011 19:56:49 +0000 (12:56 -0700)]
Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
Robert Greenwalt [Tue, 7 Jun 2011 19:45:41 +0000 (12:45 -0700)]
resolved conflicts for merge of
8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
Irfan Sheriff [Tue, 7 Jun 2011 19:29:59 +0000 (12:29 -0700)]
Clear IP configuration on lost network
Bug:
4391449
Change-Id: I574128083a5612f13fcccaf5ed091eae114b7943
Robert Greenwalt [Tue, 7 Jun 2011 19:00:37 +0000 (12:00 -0700)]
Merge "Reveal some network constants." into honeycomb-mr2
Adam Powell [Tue, 7 Jun 2011 18:32:23 +0000 (11:32 -0700)]
am
a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '
a476813dccec241632810c1cbb11bcfbf17841b0':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
Wink Saville [Tue, 7 Jun 2011 17:58:09 +0000 (10:58 -0700)]
Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
Robert Greenwalt [Tue, 7 Jun 2011 17:57:20 +0000 (10:57 -0700)]
Merge "Fix NPE in the statusbar." into honeycomb-LTE
Wink Saville [Tue, 7 Jun 2011 17:44:43 +0000 (10:44 -0700)]
Preferred network discrepancy after rild is restarted.
If the preferred network had updated before rild restarts,
the new setting value is ignored on RIL_CONNECT event.
bug: IKXEVERESTLTE-1494
Change-Id: Iec6395187c0d749208904db857b80e28f7d92c21
John Wang [Tue, 31 May 2011 18:20:55 +0000 (11:20 -0700)]
Add SIM PUK unlockscreen.
Puk unlockscreen is implemented as SimPukUnlockScreen.
Added config_enable_puk_unlock_screen to control the display of puk unlock screen.
Using config_voice_capable to control the display of emergency call button.
bug:
4384956
Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
Adam Powell [Fri, 3 Jun 2011 00:40:51 +0000 (17:40 -0700)]
Make Theme.Holo.Light.NoActionBar and
Theme.Holo.Light.NoActionBar.Fullscreen public.
Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
Jeff Brown [Tue, 7 Jun 2011 04:08:25 +0000 (21:08 -0700)]
am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
5cb05eea289559b30cf4f84130cb6afba0921638':
Fix build.
Jeff Brown [Tue, 7 Jun 2011 04:06:30 +0000 (21:06 -0700)]
Merge "Fix build." into honeycomb-mr2