OSDN Git Service
Jaikumar Ganesh [Mon, 20 Jun 2011 22:58:25 +0000 (15:58 -0700)]
am
f3670df2: am
2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit '
f3670df2ca8e521179907978c7009cba791df7c4':
New strings for Bluetooth
Jaikumar Ganesh [Mon, 20 Jun 2011 22:54:16 +0000 (15:54 -0700)]
am
2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit '
2c85966dd881917b426eefd9643adedf6b0d4ffc':
New strings for Bluetooth
Jaikumar Ganesh [Mon, 20 Jun 2011 22:29:43 +0000 (15:29 -0700)]
Merge "New strings for Bluetooth" into gingerbread
Jaikumar Ganesh [Mon, 20 Jun 2011 19:21:14 +0000 (12:21 -0700)]
New strings for Bluetooth
This is for the user dialog for incoming BT requests.
Change-Id: Ifa8f8e9e00861c65cf1d2f0520d072935b845785
Eric Fischer [Thu, 16 Jun 2011 22:55:10 +0000 (15:55 -0700)]
am
3c75fbc5: (-s ours) am
5bdc3e91: Import revised Croatian translations.
* commit '
3c75fbc55667d4b3f368afbd29ef78eab55303a2':
Import revised Croatian translations.
Eric Fischer [Thu, 16 Jun 2011 22:48:43 +0000 (15:48 -0700)]
am
5bdc3e91: Import revised Croatian translations.
* commit '
5bdc3e9139a7b37b97a56554cc9a89abc196b437':
Import revised Croatian translations.
Eric Fischer [Thu, 16 Jun 2011 21:41:45 +0000 (14:41 -0700)]
am
3bf263c9: am
b5c4437f: Import revised translations. DO NOT MERGE
* commit '
3bf263c97e23eeec199bd56ef520fba17a1e3917':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 16 Jun 2011 21:29:39 +0000 (14:29 -0700)]
am
b5c4437f: Import revised translations. DO NOT MERGE
* commit '
b5c4437f336c3e79d34428de0b1b7ce22785fb29':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 22:13:19 +0000 (15:13 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I4fa5f4000565d487a86e858cb3520555b2147dd2
Eric Fischer [Wed, 15 Jun 2011 19:09:02 +0000 (12:09 -0700)]
Import revised Croatian translations.
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
Amith Yamasani [Tue, 14 Jun 2011 22:44:23 +0000 (15:44 -0700)]
am
e7f7643c: am
6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '
e7f7643c485ed6926bc354ca28628d5179019b50':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
Amith Yamasani [Tue, 14 Jun 2011 22:41:00 +0000 (15:41 -0700)]
am
6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '
6ef6f183e4d8be0828d1a969178a6e315d8a0ea7':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
Amith Yamasani [Tue, 14 Jun 2011 22:02:46 +0000 (15:02 -0700)]
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
Bug:
4598717
Change-Id: I7f1c5bf6e079bb36301e81085096c5b82615814b
Mike Lockwood [Mon, 13 Jun 2011 11:36:26 +0000 (04:36 -0700)]
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
Mike Lockwood [Mon, 13 Jun 2011 11:25:51 +0000 (04:25 -0700)]
am
d2a6f28f: Disable option to format SD card for secondary external storage
* commit '
d2a6f28fa7ba8189d2a1987129db27fd840fac0f':
Disable option to format SD card for secondary external storage
Mike Lockwood [Sat, 11 Jun 2011 21:56:34 +0000 (17:56 -0400)]
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>
Freeman Ng [Fri, 10 Jun 2011 14:46:40 +0000 (07:46 -0700)]
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
Freeman Ng [Fri, 10 Jun 2011 14:46:37 +0000 (07:46 -0700)]
am
f2a9bd33: am
0a67cdb7: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
* commit '
f2a9bd337b495b65f9e6708117835b2ff986d5af':
add "behind" screen orientation to prevent spurious flipping
Freeman Ng [Fri, 10 Jun 2011 01:22:02 +0000 (18:22 -0700)]
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
Freeman Ng [Fri, 10 Jun 2011 01:22:00 +0000 (18:22 -0700)]
am
0a67cdb7: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
* commit '
0a67cdb7e1d853ae0431c36e95930bbf355eca52':
add "behind" screen orientation to prevent spurious flipping
Freeman Ng [Fri, 10 Jun 2011 01:20:13 +0000 (18:20 -0700)]
Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
Freeman Ng [Fri, 10 Jun 2011 01:20:04 +0000 (18:20 -0700)]
Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
Dianne Hackborn [Thu, 9 Jun 2011 23:09:00 +0000 (16:09 -0700)]
am
60d8b3f8: am
55c86911: Mark access to private resources now that aapt enforces this.
* commit '
60d8b3f875ae5630330feacc450169223e605166':
Mark access to private resources now that aapt enforces this.
Dianne Hackborn [Thu, 9 Jun 2011 23:04:44 +0000 (16:04 -0700)]
am
55c86911: Mark access to private resources now that aapt enforces this.
* commit '
55c869119aabc27d3b6c6b4aab0e69faf57f1250':
Mark access to private resources now that aapt enforces this.
Freeman Ng [Thu, 9 Jun 2011 22:42:25 +0000 (15:42 -0700)]
remove disabling of Back/Dismiss button for 10" mode
bug:
4580049
Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700
Dianne Hackborn [Thu, 9 Jun 2011 22:33:56 +0000 (15:33 -0700)]
Mark access to private resources now that aapt enforces this.
Change-Id: Ifea6854d8295294011b5253640198a10e1b5c1e1
Freeman Ng [Thu, 9 Jun 2011 19:00:35 +0000 (12:00 -0700)]
add "behind" screen orientation to prevent spurious flipping
Calling setRequestedOrientation() before setContentView() used to
start activities off in the desired orientation even if the device
was in the opposite orientation, but now, there's a kind of lag
where they display briefly in the device orientation before
flipping to the request one. This change eliminates this effect.
bug:
4581374
Change-Id: I807b0a0a8a247ec8e51b85707afcbd9f75ed9956
Justin Ho [Thu, 9 Jun 2011 06:33:05 +0000 (23:33 -0700)]
am
ea8f103f: am
7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
* commit '
ea8f103f8310c869f84d8ad48a167e8e0b63923b':
Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
Justin Ho [Thu, 9 Jun 2011 06:30:25 +0000 (23:30 -0700)]
am
7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
* commit '
7825cb295c5f08f84282b4bbaeb03da0a536a826':
Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
Justin Ho [Thu, 9 Jun 2011 02:25:29 +0000 (19:25 -0700)]
Fixing remaining SetupWizard backgrounds for Flyer
Bug:
4523403
Change-Id: I568747b5b856f0418caaf81664dcfa5b8fdb2481
Irfan Sheriff [Tue, 7 Jun 2011 20:58:28 +0000 (13:58 -0700)]
am
f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
* commit '
f448c32d9b4718e657fd4811f43d8df0f9d921af':
Fix UI settings display issues
Irfan Sheriff [Tue, 7 Jun 2011 20:54:53 +0000 (13:54 -0700)]
Merge "Fix UI settings display issues" into honeycomb-LTE
Jaikumar Ganesh [Tue, 7 Jun 2011 20:17:35 +0000 (13:17 -0700)]
am
a6daa21d: (-s ours) am
015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '
a6daa21db833191a4e83aac5c488f971bff4578c':
Import translations for cherry-picked Bluetooth changes.
Freeman Ng [Tue, 7 Jun 2011 20:16:13 +0000 (13:16 -0700)]
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
Freeman Ng [Tue, 7 Jun 2011 19:58:06 +0000 (12:58 -0700)]
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
Freeman Ng [Tue, 7 Jun 2011 19:53:41 +0000 (12:53 -0700)]
Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
Irfan Sheriff [Tue, 7 Jun 2011 19:28:26 +0000 (12:28 -0700)]
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
Freeman Ng [Tue, 7 Jun 2011 18:51:23 +0000 (11:51 -0700)]
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
Freeman Ng [Tue, 7 Jun 2011 18:48:33 +0000 (11:48 -0700)]
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
Freeman Ng [Tue, 7 Jun 2011 18:46:02 +0000 (11:46 -0700)]
Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:40 +0000 (10:01 -0700)]
am
bd34e568: (-s ours) am
eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit '
bd34e568bf0a986f7254b93ac3b69fe3c0459162':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:36 +0000 (10:01 -0700)]
am
aeca1851: (-s ours) am
c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit '
aeca185107481f28ad248c4f811bd708be8f5bff':
Allow users to change the length of BT disoverability. DO NOT MERGE
Gilles Debunne [Tue, 7 Jun 2011 01:18:31 +0000 (18:18 -0700)]
am
440ca974: am
8f1bd8a7: Bug
4539424: confirmation dialog always shown
* commit '
440ca97483553d2656b90001beabe76d38773544':
Bug
4539424: confirmation dialog always shown
Gilles Debunne [Tue, 7 Jun 2011 00:14:03 +0000 (17:14 -0700)]
am
8f1bd8a7: Bug
4539424: confirmation dialog always shown
* commit '
8f1bd8a7526edf49196430be214acb54e66a63ee':
Bug
4539424: confirmation dialog always shown
Marco Nelissen [Mon, 6 Jun 2011 23:29:34 +0000 (16:29 -0700)]
resolved conflicts for merge of
531bed61 to honeycomb-plus-aosp
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
Freeman Ng [Mon, 6 Jun 2011 23:27:55 +0000 (16:27 -0700)]
add options to lock suw wifi setup orientation into portrait or landscape
bug:
4522454
Change-Id: I30ba3d4b5d0e4949ed6744cc9f0f68306fec9ce8
Gilles Debunne [Mon, 6 Jun 2011 22:48:08 +0000 (15:48 -0700)]
Bug
4539424: confirmation dialog always shown
Change-Id: Id1e2a52a07255e2c98cbd0e8151a82d7a2612517
Gilles Debunne [Mon, 6 Jun 2011 22:22:53 +0000 (15:22 -0700)]
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
Gilles Debunne [Mon, 6 Jun 2011 22:22:51 +0000 (15:22 -0700)]
am
2a9dfc5c: am
99da1a22: Always show unmount confirmation dialog
* commit '
2a9dfc5c0c8cd75a5eac7a75fda7e25e5ce9f27f':
Always show unmount confirmation dialog
Gilles Debunne [Mon, 6 Jun 2011 22:18:37 +0000 (15:18 -0700)]
am
90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
* commit '
90599cdfe8ff528b34e3578333c5eea83cf3b293':
Used space visible in SD Card bar graph
Gilles Debunne [Mon, 6 Jun 2011 22:18:35 +0000 (15:18 -0700)]
am
99da1a22: Always show unmount confirmation dialog
* commit '
99da1a22a35eed631a757ccbf1bac1d7af74124d':
Always show unmount confirmation dialog
Gilles Debunne [Mon, 6 Jun 2011 22:16:05 +0000 (15:16 -0700)]
Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
Freeman Ng [Thu, 2 Jun 2011 22:44:51 +0000 (15:44 -0700)]
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
Gilles Debunne [Fri, 3 Jun 2011 21:47:12 +0000 (14:47 -0700)]
Always show unmount confirmation dialog
Somehow related to bug
4534261
Change-Id: I2a64406ced4a2c231114d7bb949b84c59199fd82
Gilles Debunne [Fri, 3 Jun 2011 21:26:55 +0000 (14:26 -0700)]
Used space visible in SD Card bar graph
Bug
4544470
Change-Id: Iccae9bb568f1f7baf81c702f29f7a9e238d39d2b
Amith Yamasani [Fri, 3 Jun 2011 01:29:49 +0000 (18:29 -0700)]
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.
Amith Yamasani [Fri, 3 Jun 2011 01:27:54 +0000 (18:27 -0700)]
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.
Amith Yamasani [Fri, 3 Jun 2011 01:26:28 +0000 (18:26 -0700)]
Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
Amith Yamasani [Fri, 3 Jun 2011 01:05:40 +0000 (18:05 -0700)]
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
Jeff Brown [Fri, 3 Jun 2011 00:31:11 +0000 (17:31 -0700)]
am
bb8fc4a4: am
9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '
bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682':
Add a preference panel for mouse speed.
Ben Komalo [Fri, 3 Jun 2011 00:28:25 +0000 (17:28 -0700)]
am
1e43e694: am
57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '
1e43e694ae0822426d4759aa2d5192cbe5d15d63':
Fix cryptkeeper UI for 7" tablets.
Jeff Brown [Fri, 3 Jun 2011 00:27:39 +0000 (17:27 -0700)]
am
9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '
9fc039e7bcea7f1845a51fcb70d608663ceec227':
Add a preference panel for mouse speed.
Jeff Brown [Fri, 3 Jun 2011 00:26:13 +0000 (17:26 -0700)]
Merge "Add a preference panel for mouse speed." into honeycomb-mr2
Ben Komalo [Fri, 3 Jun 2011 00:24:42 +0000 (17:24 -0700)]
am
57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '
57b17f50436e4760ad0466aadaafe2599abce442':
Fix cryptkeeper UI for 7" tablets.
Ben Komalo [Fri, 3 Jun 2011 00:21:39 +0000 (17:21 -0700)]
Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
Jeff Brown [Thu, 2 Jun 2011 10:10:28 +0000 (03:10 -0700)]
Add a preference panel for mouse speed.
Bug:
4124987
Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
Ben Komalo [Thu, 2 Jun 2011 18:40:00 +0000 (11:40 -0700)]
Fix cryptkeeper UI for 7" tablets.
- fixes pw entry/keyboard overlap on landscape
- fixes progress screen to be centered
Bug:
4478944
Change-Id: I411ad3507f42029022815ec001d0d8e5464ac0a1
Amith Yamasani [Thu, 2 Jun 2011 20:17:05 +0000 (13:17 -0700)]
am
300c4f61: am
3a5b3494: Make the BT class icon visible.
* commit '
300c4f61d823936e4a34fcece25c14c73877c994':
Make the BT class icon visible.
Amith Yamasani [Thu, 2 Jun 2011 20:13:38 +0000 (13:13 -0700)]
am
3a5b3494: Make the BT class icon visible.
* commit '
3a5b3494a7543c1ddb66c6f630856c3aace03f0a':
Make the BT class icon visible.
Amith Yamasani [Thu, 2 Jun 2011 18:48:55 +0000 (11:48 -0700)]
Make the BT class icon visible.
This change is required due to a change in the framework to accomodate smaller screen sizes.
Bug:
4519989
Change-Id: I77c5d72b29dec69df2bdd4d82811f4828ad155a6
Amith Yamasani [Thu, 2 Jun 2011 02:06:55 +0000 (19:06 -0700)]
am
672ad8d6: am
8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
* commit '
672ad8d66f61db0804fcf4ba9a0db067272a4b50':
Move assets to default location, instead of xlarge only.
Amith Yamasani [Thu, 2 Jun 2011 01:37:38 +0000 (18:37 -0700)]
am
8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
* commit '
8ac8456491e1409a071c7cf4e164440aeec7c4dd':
Move assets to default location, instead of xlarge only.
Amith Yamasani [Wed, 1 Jun 2011 22:43:42 +0000 (15:43 -0700)]
Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
Amith Yamasani [Wed, 1 Jun 2011 22:29:55 +0000 (15:29 -0700)]
Move assets to default location, instead of xlarge only.
Bug:
4517184
Change-Id: I3d1e0c87f9c48470166dd5bfb34c02efa5854d68
Amith Yamasani [Fri, 27 May 2011 21:53:12 +0000 (14:53 -0700)]
am
9ef2713f: am
1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '
9ef2713f2862ca13822a35e316555dda3e264352':
Reduce padding to the left of progress category to match framework changes.
Amith Yamasani [Fri, 27 May 2011 21:51:28 +0000 (14:51 -0700)]
am
1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '
1f7014a25aad4cd3fe5e6f34eb30d936f4da2fd4':
Reduce padding to the left of progress category to match framework changes.
Amith Yamasani [Fri, 27 May 2011 21:49:21 +0000 (14:49 -0700)]
Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
Amith Yamasani [Fri, 27 May 2011 21:31:28 +0000 (14:31 -0700)]
Reduce padding to the left of progress category to match framework changes.
Otherwise the WIFI/BT device names don't align with the header.
Change-Id: Ibd10cb7bb38c80a90ef895e2bdb1083b833a2824
Jaikumar Ganesh [Fri, 27 May 2011 20:47:08 +0000 (13:47 -0700)]
am
015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '
015788ca9228312dfca30785b1801f33a3a32e9a':
Import translations for cherry-picked Bluetooth changes.
Jaikumar Ganesh [Fri, 27 May 2011 20:47:01 +0000 (13:47 -0700)]
am
eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit '
eddb21a2ebd39900893da63749a00570f37e5038':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
Jaikumar Ganesh [Fri, 27 May 2011 20:46:59 +0000 (13:46 -0700)]
am
c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit '
c955d8ee1d2b134f8c41989b545b7b3ed830d058':
Allow users to change the length of BT disoverability. DO NOT MERGE
Jaikumar Ganesh [Fri, 27 May 2011 20:28:57 +0000 (13:28 -0700)]
Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
Jaikumar Ganesh [Fri, 27 May 2011 20:28:49 +0000 (13:28 -0700)]
Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
Jaikumar Ganesh [Fri, 27 May 2011 20:28:41 +0000 (13:28 -0700)]
Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 27 May 2011 19:45:28 +0000 (12:45 -0700)]
Import translations for cherry-picked Bluetooth changes.
Change-Id: I03caaf58d9fd357801c05ae99b6131df992e7bdf
Jaikumar Ganesh [Wed, 2 Feb 2011 03:58:29 +0000 (19:58 -0800)]
Changes for API of Bluetooth Discoverability. DO NOT MERGE
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the default - 120 secs.
A dialog is shown by the system to the users to accept the change
in discoverability values.
Change-Id: I34ebd907656a87508b0f0b1a4bce78134edcaebf
Chris Wren [Tue, 1 Feb 2011 23:09:13 +0000 (15:09 -0800)]
Allow users to change the length of BT disoverability. DO NOT MERGE
It can set to be two minues, five minutes, an hour, or forever discoverable.
The default is 120 secs.
This addresses the internal bug
2413429:
http://b/issue?id=
2413429
and external issue 6348:
http://code.google.com/p/android/issues/detail?id=6348
Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>
Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
Gilles Debunne [Fri, 27 May 2011 01:04:14 +0000 (18:04 -0700)]
am
41a99004: am
53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit '
41a99004f1cd758205f728dbbf9bc6a735b262e3':
Erase SD Card fixed in Settings/Storage.
Gilles Debunne [Fri, 27 May 2011 01:02:41 +0000 (18:02 -0700)]
am
53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit '
5387276950a190944eeeb00c0e3c04501f0dc6a5':
Erase SD Card fixed in Settings/Storage.
Gilles Debunne [Fri, 27 May 2011 01:00:34 +0000 (18:00 -0700)]
Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
Gilles Debunne [Thu, 26 May 2011 01:34:59 +0000 (18:34 -0700)]
Erase SD Card fixed in Settings/Storage.
Adding the StorageVolume to the format intent.
Change-Id: If1a50a2d5c5154e9f00116db536c62324c447e7c
Eric Fischer [Thu, 26 May 2011 21:14:20 +0000 (14:14 -0700)]
am
c3786952: am
beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
c3786952ccd726b31165377c18306001a11ad6c1':
Import revised translations. DO NOT MERGE
sy310.choi [Thu, 26 May 2011 20:47:20 +0000 (13:47 -0700)]
am
95364e4a: Allow alternate string to be used for min_number
* commit '
95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
Allow alternate string to be used for min_number
Eric Fischer [Thu, 26 May 2011 20:46:20 +0000 (13:46 -0700)]
am
beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
beee8290a23794e0c7d89ce8e6e682564e4d5a52':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 26 May 2011 18:37:50 +0000 (11:37 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Eric Fischer [Thu, 26 May 2011 18:25:33 +0000 (11:25 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I4728d6b761331990b1424fb9a676275648a99bf4
Dianne Hackborn [Thu, 26 May 2011 18:05:49 +0000 (11:05 -0700)]
am
b4799fc9: am
aef746c4: Implement new manage apps UI for compat mode.
* commit '
b4799fc9ee29535bb371da9c04a0f750a77115e1':
Implement new manage apps UI for compat mode.
Freeman Ng [Thu, 26 May 2011 18:05:47 +0000 (11:05 -0700)]
am
6356b17a: am
d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2
* commit '
6356b17a53fc939c145de26dbc258ef7797ba05c':
make setup wizard's wifi and datetime settings look good for 7"
sy310.choi [Tue, 24 May 2011 05:19:16 +0000 (14:19 +0900)]
Allow alternate string to be used for min_number
"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.
Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
Dianne Hackborn [Thu, 26 May 2011 17:02:22 +0000 (10:02 -0700)]
am
aef746c4: Implement new manage apps UI for compat mode.
* commit '
aef746c45f14c8a170dba48c4b55f93cae0e24e4':
Implement new manage apps UI for compat mode.
OSDN Git Service
