Dianne Hackborn
6c0533f994
am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
...
* commit 'c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
Add new landscape and portrait orientation features.
2011-06-14 11:36:05 -07:00
Dianne Hackborn
c5193c6285
Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
2011-06-14 11:24:29 -07:00
Dianne Hackborn
e289bff0ec
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
2011-06-14 11:23:52 -07:00
John Wang
49572479a9
Update sim missing message in lock screen.
...
Update SIM missing message to include SIM corrupted situation.
bug:4392059
Change-Id: Icf2f8d801a2e2761a309442209118a6a71a4c633
2011-06-13 16:17:39 -07:00
Mathias Agopian
77079399fc
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)
2011-06-13 14:13:21 -07:00
Mathias Agopian
a9c9a4baf2
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
...
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
2011-06-13 13:44:28 -07:00
Dianne Hackborn
fc441bfff9
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.
2011-06-10 18:39:48 -07:00
Dianne Hackborn
fd63814abe
Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
2011-06-10 18:37:22 -07:00
Dianne Hackborn
afc4b283fd
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
2011-06-10 18:34:54 -07:00
Jim Miller
5fe24ec77d
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.
2011-06-10 17:41:20 -07:00
John Wang
2addaf97b3
Merge "Add toString for IccCard Status and App." into honeycomb-LTE
2011-06-10 17:19:42 -07:00
Jim Miller
8daefb9c63
Fix layout issue on table when device thinks there's a SIM.
...
bug:4411799
Change-Id: I9d9ef036d4cf424ed760e0db157bb1f020b7c678
2011-06-10 15:57:09 -07:00
Teng-Hui Zhu
b5141a9fc7
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
2011-06-10 14:22:52 -07:00
Teng-Hui Zhu
90bdb69bf9
Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2
2011-06-10 14:19:22 -07:00
Robert Greenwalt
1ea549e899
Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
2011-06-10 14:08:28 -07:00
Teng-Hui Zhu
2302fe5226
fix one NPE when webChromeClient don't have progress view support
...
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
2011-06-10 10:56:33 -07:00
Dianne Hackborn
5624b793cb
am 2bb2d48f: Commit final (maybe) MR 2 API.
...
* commit '2bb2d48f9ca1726b8de957ec7ea321c767409c12':
Commit final (maybe) MR 2 API.
2011-06-09 19:26:25 -07:00
Dianne Hackborn
2bb2d48f9c
Commit final (maybe) MR 2 API.
...
Change-Id: I42f72819a29d4ac7902b7be5af0b5d353d790eae
2011-06-09 19:22:05 -07:00
John Wang
c7a58b4de0
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
2011-06-09 19:10:12 -07:00
Dianne Hackborn
88748e6dc0
am d86302df: Quiet the log.
...
* commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867':
Quiet the log.
2011-06-09 17:40:08 -07:00
Dianne Hackborn
d86302df0e
Quiet the log.
...
Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
2011-06-09 17:37:00 -07:00
Dianne Hackborn
c6adfed6dc
am f795e9a8: Okay *now* really enforce the limit on non-public styles.
...
* commit 'f795e9a86d4f62e5314ef95978c3ea17d90975db':
Okay *now* really enforce the limit on non-public styles.
2011-06-09 17:28:00 -07:00
Kazuhiro Ondo
3fc9055c7f
CDMALTE: Get roaming status based on SID/NID
...
Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
2011-06-09 16:42:18 -07:00
Dianne Hackborn
f795e9a86d
Okay *now* really enforce the limit on non-public styles.
...
Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae
2011-06-09 16:17:53 -07:00
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