Amith Yamasani
f14f96efa8
am b3f6116e: am fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
...
* commit 'b3f6116e2bd8bfa1b23b724526badaa6b1602a12':
Fix: Text is cut in Edit word edit box when adding word to dictionary
2011-08-12 13:16:17 -07:00
Amith Yamasani
fd73824d60
Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
2011-08-11 12:17:03 -07:00
Dianne Hackborn
f70f60c4dc
am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
...
* commit '7d19d795c8d7a5692879523d8179a8a46226bbbc':
Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-14 09:18:01 -07:00
Dianne Hackborn
b41b85dc9b
am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
...
* commit 'c74500f44e3673b7728c2f619ee3d61a73ad5526':
Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-13 16:50:07 -07:00
John Wang
25bd33e1cf
am d7b2dccb: Display IMEI and ICCID for LTE device.
...
* commit 'd7b2dccbe60a02965186d28f0b671ef1c419a2a8':
Display IMEI and ICCID for LTE device.
2011-07-13 10:54:17 -07:00
John Wang
d7b2dccbe6
Display IMEI and ICCID for LTE device.
...
Display IMEI nad ICCID in About tablet / Status for LTE devices.
bug:4983512
bug:5001888
Change-Id: I4c418b159b49bef96acd5ef300c9b71379821d1b
2011-07-13 10:25:29 -07:00
Johannes Carlsson
8258dc23d3
Fix NPE due to missing ProcessItem.mPackageInfo
...
The reason was that a item was removed from the SparseArray while
iterating it causing one ProcessItem to be skipped in the loop which
makes sure that mPackageInfo is not null. This happens when all
processes for one uid is stopped and a new process is created.
This problem was found by running monkey.
Change-Id: I5e9a76e8007819d5e6d9ba15af0c2362da193526
2011-07-01 07:56:27 +02:00
John Wang
ab824c8161
am f44308a7: Display FCC id for LTE in Settings.
...
* commit 'f44308a78d35db9cc211f26cd811c067460b18f1':
Display FCC id for LTE in Settings.
2011-06-30 16:41:15 -07:00
John Wang
f44308a78d
Display FCC id for LTE in Settings.
...
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
2011-06-30 16:33:54 -07:00
Dianne Hackborn
c9a477aeac
am e3cfa9bc: am 13bac39d: Remove obsolete compat mode UI.
...
* commit 'e3cfa9bc557e92d7a1b01270a405a9bd99700310':
Remove obsolete compat mode UI.
2011-06-24 12:41:05 -07:00
Dianne Hackborn
e3cfa9bc55
am 13bac39d: Remove obsolete compat mode UI.
...
* commit '13bac39d2120a82b8a22b52f0db0727aa04b1f38':
Remove obsolete compat mode UI.
2011-06-24 12:24:21 -07:00
Dianne Hackborn
13bac39d21
Remove obsolete compat mode UI.
...
Change-Id: Ie16f70af4b8d6f33db21363a478049659669e0b3
2011-06-23 17:04:06 -07:00
Jaikumar Ganesh
38ae9125b4
am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
...
* commit '7ab66973a973b9d23c411bf1c6631fa93c4903bf':
DO NOT MERGE Show user dialog for BT.
2011-06-21 13:24:22 -07:00
Jaikumar Ganesh
7ab66973a9
Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
2011-06-21 11:23:47 -07:00
Jaikumar Ganesh
7bfa6dca07
DO NOT MERGE Show user dialog for BT.
...
Show user dialog for incoming BT connection
requests from unknown devices.
Contribution by: Wei (Matthew) Xie
Change-Id: I7e9e8bbbd8808a7569f84d213fa3d716f7f5bc80
2011-06-20 19:30:21 -07:00
Amith Yamasani
80cc0ffa2b
am e7f7643c: am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
...
* commit 'e7f7643c485ed6926bc354ca28628d5179019b50':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
2011-06-14 15:44:23 -07:00
Amith Yamasani
e7f7643c48
am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
...
* commit '6ef6f183e4d8be0828d1a969178a6e315d8a0ea7':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
2011-06-14 15:41:00 -07:00
Amith Yamasani
6ef6f183e4
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
...
Bug: 4598717
Change-Id: I7f1c5bf6e079bb36301e81085096c5b82615814b
2011-06-14 15:19:14 -07:00
Mike Lockwood
c938a02bc6
am c1db1192: am d2a6f28f: Disable option to format SD card for secondary external storage
...
* commit 'c1db119250fd481341c095f47a62adb14ad09484':
Disable option to format SD card for secondary external storage
2011-06-13 04:36:26 -07:00
Mike Lockwood
c1db119250
am d2a6f28f: Disable option to format SD card for secondary external storage
...
* commit 'd2a6f28fa7ba8189d2a1987129db27fd840fac0f':
Disable option to format SD card for secondary external storage
2011-06-13 04:25:51 -07:00
Mike Lockwood
d2a6f28fa7
Disable option to format SD card for secondary external storage
...
This is a temporary workaround for an interoperability problem with MTP
Change-Id: Iaf63ea0ac76e12ffd635765785da027cab0fcb9a
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-06-11 18:11:03 -04:00
Freeman Ng
945aac2e29
am fb096074: am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
...
* commit 'fb09607469a5cb42c833725d121e517af5daca72':
remove disabling of Back/Dismiss button for 10" mode
2011-06-10 07:46:40 -07:00
Freeman Ng
fb09607469
am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
...
* commit '148222fd43499a578c16c0bdf6ae9336255facd7':
remove disabling of Back/Dismiss button for 10" mode
2011-06-09 18:22:02 -07:00
Freeman Ng
03708e030a
remove disabling of Back/Dismiss button for 10" mode
...
bug: 4580049
Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700
2011-06-09 16:00:34 -07:00
Irfan Sheriff
4a1b8898c7
am f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
...
* commit 'f448c32d9b4718e657fd4811f43d8df0f9d921af':
Fix UI settings display issues
2011-06-07 13:58:28 -07:00
Irfan Sheriff
f448c32d9b
Merge "Fix UI settings display issues" into honeycomb-LTE
2011-06-07 13:54:53 -07:00
Freeman Ng
ab48c22e7d
am c47e9a1d: am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
...
* commit 'c47e9a1d65dad04f778973b2898acf96c48b8914':
use prefs-style layout for setup wizard date/time settings on non-xlarge screens
2011-06-07 13:16:13 -07:00
Freeman Ng
c47e9a1d65
am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
...
* commit '0fd7736b7153c1a304d7c6098ecf1223052f56d5':
use prefs-style layout for setup wizard date/time settings on non-xlarge screens
2011-06-07 12:58:06 -07:00
Freeman Ng
0fd7736b71
Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
2011-06-07 12:53:41 -07:00
Irfan Sheriff
317e0aa530
Fix UI settings display issues
...
- Update access points to reflect the latest IP configuration
- Show IP list for static IP networks
Bug: 4391449
Change-Id: If8fb6fe8bdca9d6e635b1b12927c17e1661f200c
2011-06-07 12:28:26 -07:00
Freeman Ng
6beb924ec2
am 351367bb: am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
...
* commit '351367bbd830646ddeed49227ab37442479556f9':
add options to lock suw wifi setup orientation into portrait or landscape
2011-06-07 11:51:23 -07:00
Freeman Ng
351367bbd8
am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
...
* commit 'f368d4dc525f79b09bd1e36b96d0ec5b179a1e8c':
add options to lock suw wifi setup orientation into portrait or landscape
2011-06-07 11:48:33 -07:00
Freeman Ng
f368d4dc52
Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
2011-06-07 11:46:02 -07:00
Gilles Debunne
62634b309a
am 440ca974: am 8f1bd8a7: Bug 4539424: confirmation dialog always shown
...
* commit '440ca97483553d2656b90001beabe76d38773544':
Bug 4539424: confirmation dialog always shown
2011-06-06 18:18:31 -07:00
Gilles Debunne
440ca97483
am 8f1bd8a7: Bug 4539424: confirmation dialog always shown
...
* commit '8f1bd8a7526edf49196430be214acb54e66a63ee':
Bug 4539424: confirmation dialog always shown
2011-06-06 17:14:03 -07:00
Marco Nelissen
079e30cd2a
resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp
...
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
2011-06-06 16:29:34 -07:00
Freeman Ng
f54fec5939
add options to lock suw wifi setup orientation into portrait or landscape
...
bug: 4522454
Change-Id: I30ba3d4b5d0e4949ed6744cc9f0f68306fec9ce8
2011-06-06 16:27:55 -07:00
Gilles Debunne
8f1bd8a752
Bug 4539424: confirmation dialog always shown
...
Change-Id: Id1e2a52a07255e2c98cbd0e8151a82d7a2612517
2011-06-06 15:48:08 -07:00
Gilles Debunne
cfe26919ab
am 533b7b53: am 90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
...
* commit '533b7b53bcff1a682f295398293878f85ec419e3':
Used space visible in SD Card bar graph
2011-06-06 15:22:53 -07:00
Gilles Debunne
b7e7a8cb9c
am 2a9dfc5c: am 99da1a22: Always show unmount confirmation dialog
...
* commit '2a9dfc5c0c8cd75a5eac7a75fda7e25e5ce9f27f':
Always show unmount confirmation dialog
2011-06-06 15:22:51 -07:00
Gilles Debunne
533b7b53bc
am 90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
...
* commit '90599cdfe8ff528b34e3578333c5eea83cf3b293':
Used space visible in SD Card bar graph
2011-06-06 15:18:37 -07:00
Gilles Debunne
2a9dfc5c0c
am 99da1a22: Always show unmount confirmation dialog
...
* commit '99da1a22a35eed631a757ccbf1bac1d7af74124d':
Always show unmount confirmation dialog
2011-06-06 15:18:35 -07:00
Gilles Debunne
90599cdfe8
Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
2011-06-06 15:16:05 -07:00
Freeman Ng
7f6f6e18c9
use prefs-style layout for setup wizard date/time settings on non-xlarge screens
...
Adjusted the screen size test to fall back to phone version of
DateTimeSettingsSetupWizard on large screens.
I made the following changes from how the phone version works:
1. Some layout changes. (Tablet look, bigger margins.)
2. Use zone picker to select time zone.
3. Added isFirstRun boolean extra to hide the pref fields
we don't need to see from setup wizard
Furthermore, I made the following fixes to the existing phone flow
(which had probably never yet been tried on a phone):
1. Added conditionals around access to some variables that only
exist in the xlarge layout.
2. Implemented PreferenceFragment.OnPreferenceStartFragmentCallback
in DateTimeSettingsSetupWizard in order to catch the user tapping
on the timezone preference and show the time zone picker popup.
(Note: for phones in ICS, we might want to launch the zone picker
preferences style, like it would have been had this been a
PreferenceActivity. Or maybe we should just create a separate
DateTimeSettingsSetupWizardPhone activity that subclasses
PreferencesActivity and doesn't need to play this trick.)
Change-Id: Ib5774a005c9f44d730d86c13746d91eb712141cc
2011-06-06 12:40:28 -07:00
Gilles Debunne
99da1a22a3
Always show unmount confirmation dialog
...
Somehow related to bug 4534261
Change-Id: I2a64406ced4a2c231114d7bb949b84c59199fd82
2011-06-03 14:47:13 -07:00
Gilles Debunne
4f734d9d59
Used space visible in SD Card bar graph
...
Bug 4544470
Change-Id: Iccae9bb568f1f7baf81c702f29f7a9e238d39d2b
2011-06-03 14:30:39 -07:00
Amith Yamasani
51a1bb15ea
am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
...
* commit 'ad4662223210827df1e62ba4c7ec24dba80a47df':
Fix account type dialog re-creation on orientation change.
2011-06-02 18:29:49 -07:00
Amith Yamasani
ad46622232
am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
...
* commit '51a9d15722b3c94ac92e05b19048b678247b034e':
Fix account type dialog re-creation on orientation change.
2011-06-02 18:27:54 -07:00
Amith Yamasani
51a9d15722
Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
2011-06-02 18:26:28 -07:00
Amith Yamasani
7bb8f7288e
Fix account type dialog re-creation on orientation change.
...
Bug: 4499512
Dummy activity that launches ChooseAccountActivity was re-launching it on orientation
changes. Make sure that it only launches it one time.
Change-Id: I764a59eaefc3ce4546330ed1b994d88b8703ce80
2011-06-02 18:23:55 -07:00