Jaikumar Ganesh
3f3f390b87
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.
2011-06-07 13:17:35 -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
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
Jaikumar Ganesh
37940170d0
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
2011-06-07 10:01:40 -07:00
Jaikumar Ganesh
eeb7803a95
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
2011-06-07 10:01:36 -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
Jeff Brown
a3a96d180f
am bb8fc4a4
: am 9fc039e7
: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
...
* commit 'bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682':
Add a preference panel for mouse speed.
2011-06-02 17:31:11 -07:00
Ben Komalo
657a7ad8b2
am 1e43e694
: am 57b17f50
: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
...
* commit '1e43e694ae0822426d4759aa2d5192cbe5d15d63':
Fix cryptkeeper UI for 7" tablets.
2011-06-02 17:28:25 -07:00
Jeff Brown
bb8fc4a4ea
am 9fc039e7
: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
...
* commit '9fc039e7bcea7f1845a51fcb70d608663ceec227':
Add a preference panel for mouse speed.
2011-06-02 17:27:39 -07:00
Jeff Brown
9fc039e7bc
Merge "Add a preference panel for mouse speed." into honeycomb-mr2
2011-06-02 17:26:13 -07:00
Ben Komalo
1e43e694ae
am 57b17f50
: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
...
* commit '57b17f50436e4760ad0466aadaafe2599abce442':
Fix cryptkeeper UI for 7" tablets.
2011-06-02 17:24:42 -07:00
Ben Komalo
57b17f5043
Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
2011-06-02 17:21:39 -07:00
Jeff Brown
d82487b0ff
Add a preference panel for mouse speed.
...
Bug: 4124987
Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
2011-06-02 15:13:27 -07:00
Ben Komalo
a1d57709c2
Fix cryptkeeper UI for 7" tablets.
...
- fixes pw entry/keyboard overlap on landscape
- fixes progress screen to be centered
Bug: 4478944
Change-Id: I411ad3507f42029022815ec001d0d8e5464ac0a1
2011-06-02 13:59:03 -07:00
Amith Yamasani
1334d7fc3a
am 300c4f61
: am 3a5b3494
: Make the BT class icon visible.
...
* commit '300c4f61d823936e4a34fcece25c14c73877c994':
Make the BT class icon visible.
2011-06-02 13:17:05 -07:00
Amith Yamasani
300c4f61d8
am 3a5b3494
: Make the BT class icon visible.
...
* commit '3a5b3494a7543c1ddb66c6f630856c3aace03f0a':
Make the BT class icon visible.
2011-06-02 13:13:38 -07:00
Amith Yamasani
3a5b3494a7
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
2011-06-02 11:48:55 -07:00
Amith Yamasani
6c82fe07cc
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.
2011-06-01 19:06:55 -07:00
Amith Yamasani
672ad8d66f
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.
2011-06-01 18:37:38 -07:00
Amith Yamasani
8ac8456491
Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
2011-06-01 15:43:42 -07:00
Amith Yamasani
12f55852c0
Move assets to default location, instead of xlarge only.
...
Bug: 4517184
Change-Id: I3d1e0c87f9c48470166dd5bfb34c02efa5854d68
2011-06-01 15:29:55 -07:00
Amith Yamasani
be6cb943db
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.
2011-05-27 14:53:12 -07:00
Amith Yamasani
9ef2713f28
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.
2011-05-27 14:51:28 -07:00
Amith Yamasani
1f7014a25a
Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
2011-05-27 14:49:21 -07:00
Amith Yamasani
e7da064e4f
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
2011-05-27 14:31:28 -07:00
Jaikumar Ganesh
a6daa21db8
am 015788ca
: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
...
* commit '015788ca9228312dfca30785b1801f33a3a32e9a':
Import translations for cherry-picked Bluetooth changes.
2011-05-27 13:47:08 -07:00
Jaikumar Ganesh
bd34e568bf
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
2011-05-27 13:47:01 -07:00
Jaikumar Ganesh
aeca185107
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
2011-05-27 13:46:59 -07:00
Jaikumar Ganesh
015788ca92
Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
2011-05-27 13:28:57 -07:00
Jaikumar Ganesh
eddb21a2eb
Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
2011-05-27 13:28:49 -07:00