Jim Miller
49b20cb5f4
am c78f8769
: am fbc72cd6
: am fd8f7f12
: Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
...
* commit 'c78f87694ddff4badfc1953821250eb68d237330':
Fix 4462497: Make ownerinfo preference layout more dynamic
2011-05-31 16:01:17 -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
Jaikumar Ganesh
c955d8ee1d
Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
2011-05-27 13:28:41 -07:00
Svetoslav Ganov
6f0b4d8143
Accessibility service specific settings.
...
This is the settings part of the change for adding
support for accessibility service specific settings.
1. Added the first cut of a SettingsCheckBoxPreference
that is a CheckBoxPreference that optionally takes
an intent to be lauched as settings of the item
represented by the preference.
2. Updated the AccessibilitySettigns to use the
SettingsCheckBoxPreference.
Change-Id: If44262b8965c65620c6b8c252f8ef356eb0d95cf
2011-05-27 13:24:31 -07:00
Eric Fischer
afe7b0466a
Import translations for cherry-picked Bluetooth changes.
...
Change-Id: I03caaf58d9fd357801c05ae99b6131df992e7bdf
2011-05-27 12:46:07 -07:00
Jaikumar Ganesh
32c7a774f5
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
2011-05-27 10:32:18 -07:00
Chris Wren
cdd9d033b0
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
2011-05-27 10:27:14 -07:00
The Android Automerger
5f15f45d76
merge in gingerbread-release history after reset to gingerbread
2011-05-26 21:28:34 -07:00
Daniel Sandler
a862f2b14b
Merge "Dream (screensaver) settings."
2011-05-26 20:27:55 -07:00
Gilles Debunne
b667422cfd
am 41a99004
: am 53872769
: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
...
* commit '41a99004f1cd758205f728dbbf9bc6a735b262e3':
Erase SD Card fixed in Settings/Storage.
2011-05-26 18:04:14 -07:00
Gilles Debunne
41a99004f1
am 53872769
: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
...
* commit '5387276950a190944eeeb00c0e3c04501f0dc6a5':
Erase SD Card fixed in Settings/Storage.
2011-05-26 18:02:41 -07:00
Gilles Debunne
5387276950
Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
2011-05-26 18:00:34 -07:00
Eric Fischer
3fa3fdc70a
Merge "Import revised translations."
2011-05-26 16:03:37 -07:00
Eric Fischer
77f9a9beef
Import revised translations.
...
Change-Id: Ied705b2da99164f4257d2a6b7b4ce95d7bfb0052
2011-05-26 15:47:05 -07:00
Gilles Debunne
6d36fd3a03
Erase SD Card fixed in Settings/Storage.
...
Adding the StorageVolume to the format intent.
Change-Id: If1a50a2d5c5154e9f00116db536c62324c447e7c
2011-05-26 15:00:17 -07:00
Eric Fischer
3518cdf914
am c3786952
: am beee8290
: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'c3786952ccd726b31165377c18306001a11ad6c1':
Import revised translations. DO NOT MERGE
2011-05-26 14:14:20 -07:00
sy310.choi
531bed610c
am 95364e4a
: Allow alternate string to be used for min_number
...
* commit '95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
Allow alternate string to be used for min_number
2011-05-26 13:47:20 -07:00
Eric Fischer
c3786952cc
am beee8290
: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'beee8290a23794e0c7d89ce8e6e682564e4d5a52':
Import revised translations. DO NOT MERGE
2011-05-26 13:46:20 -07:00
Amith Yamasani
61154c1c86
am f7d58032
: am 6246d459
: am e9f5a297
: Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
...
* commit 'f7d58032cd9dc7bc553ae47cd7a8166c6afc23d0':
Fix blank Battery Use screen due to changes in framework.
2011-05-26 11:41:41 -07:00
Eric Fischer
beee8290a2
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-26 11:37:50 -07:00
Eric Fischer
6514fd7398
Import revised translations. DO NOT MERGE
...
Change-Id: I4728d6b761331990b1424fb9a676275648a99bf4
2011-05-26 11:25:33 -07:00
Dianne Hackborn
c837756d73
am b4799fc9
: am aef746c4
: Implement new manage apps UI for compat mode.
...
* commit 'b4799fc9ee29535bb371da9c04a0f750a77115e1':
Implement new manage apps UI for compat mode.
2011-05-26 11:05:49 -07:00
Freeman Ng
f0fae7f272
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"
2011-05-26 11:05:47 -07:00
sy310.choi
95364e4af3
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
2011-05-26 10:45:07 -07:00
Gilles Debunne
d7928912d4
resolved conflicts for merge of b593a628
to master
...
Change-Id: Icf8a913e8780bb7d998cc9f4d0ed91ed66348dc6
2011-05-26 10:35:38 -07:00
Dianne Hackborn
b4799fc9ee
am aef746c4
: Implement new manage apps UI for compat mode.
...
* commit 'aef746c45f14c8a170dba48c4b55f93cae0e24e4':
Implement new manage apps UI for compat mode.
2011-05-26 10:02:22 -07:00
Freeman Ng
6356b17a53
am d671182d
: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2
...
* commit 'd671182d88a193bee25d82a1941a57a84ed0fdc4':
make setup wizard's wifi and datetime settings look good for 7"
2011-05-26 10:02:20 -07:00
Daniel Sandler
2943cfa606
Dream (screensaver) settings.
...
Depends on change Ied691856 for
Settings.Secure.DREAM_TIMEOUT and
Settings.Secure.DREAM_COMPONENT.
Change-Id: Ib6f74b74036e12637efb891b97e459a4e33444e7
2011-05-26 11:32:06 -04:00
Dianne Hackborn
aef746c45f
Implement new manage apps UI for compat mode.
...
Change-Id: Ia8db7f534b7294fbbb34e0acdedab3a96cea59e9
2011-05-26 01:06:11 -07:00
Yongwei Cai
22135ea773
Fix wrong behavior when changing pin code in settings
...
In security setting, if user change orientation during entering
pin code, the change will not apply successfully, it is because
the entered pin codes has not been saved and restored when
application was re-create after changed orientation. So we save
entered pin codes and restore them in onCreate when application
is re-created.
Change-Id: Ia8a3fb3ee75185ce028104487377e47f272905ce
2011-05-26 09:31:35 +02:00
Amith Yamasani
ba61aaaaa3
am 0fbaacaa
: am 138a695f
: am cfd524f0
: Visual adjustments for smaller tablets.
...
* commit '0fbaacaa9b29401a4191ca85dccfe68660928a11':
Visual adjustments for smaller tablets.
2011-05-25 21:28:22 -07:00
Freeman Ng
d671182d88
Merge "make setup wizard's wifi and datetime settings look good for 7"" into honeycomb-mr2
2011-05-25 21:13:03 -07:00
Freeman Ng
edb03bf537
make setup wizard's wifi and datetime settings look good for 7"
...
Note: this entailed locking datetime settings not into portrait
like everything else in the setup process, but landscape, because
the existing xlarge layout wasn't rearranging itself into a portrait
alignment very well. I can give it another try later if I can have
some help from UE.
Change-Id: Ia8ce8e8292ed768bd117beedf3d94a287e658f4b
2011-05-25 19:06:21 -07:00
Adam Powell
7d4e88b3d4
am 57218b5a
: am 3c110e50
: Fix account type selector for adding accounts to match holo layout guidelines.
...
* commit '57218b5afb696a2e34f11be74041261a44dd51a2':
Fix account type selector for adding accounts to match holo layout guidelines.
2011-05-25 18:01:04 -07:00
Adam Powell
57218b5afb
am 3c110e50
: Fix account type selector for adding accounts to match holo layout guidelines.
...
* commit '3c110e500dad9dc21ae7efa13a73f1876aa38cee':
Fix account type selector for adding accounts to match holo layout guidelines.
2011-05-25 17:58:34 -07:00
Adam Powell
3c110e500d
Fix account type selector for adding accounts to match holo layout
...
guidelines.
Change-Id: I0cb2f2655e878de65b25c46e2b852bad6e1a99ad
2011-05-25 17:46:30 -07:00
Jim Miller
c78f87694d
am fbc72cd6
: am fd8f7f12
: Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
...
* commit 'fbc72cd6013e1e7a78cb49f4751cd5729f187556':
Fix 4462497: Make ownerinfo preference layout more dynamic
2011-05-25 16:34:17 -07:00
Jim Miller
fbc72cd601
am fd8f7f12
: Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
...
* commit 'fd8f7f120dd04acaa7ac81680dcc058d4a1d20d4':
Fix 4462497: Make ownerinfo preference layout more dynamic
2011-05-25 16:27:52 -07:00
Jim Miller
fd8f7f120d
Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
2011-05-25 16:06:17 -07:00
Amith Yamasani
f7d58032cd
am 6246d459
: am e9f5a297
: Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
...
* commit '6246d459a1c5be32994778c080fd7f386e884ce5':
Fix blank Battery Use screen due to changes in framework.
2011-05-25 14:57:47 -07:00
Amith Yamasani
6246d459a1
am e9f5a297
: Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
...
* commit 'e9f5a2975b827ad61ab54747b196aed37230bbbe':
Fix blank Battery Use screen due to changes in framework.
2011-05-25 14:56:08 -07:00
Jim Miller
b633cea58b
Fix 4462497: Make ownerinfo preference layout more dynamic
...
This fixes a bug where the EditText of OwnerInfo was partially
off-screen in portrait mode on 7" devices.
Change-Id: I8ba985ac6ce88bb42209a8a7f8acc5b4476fe8f2
2011-05-25 14:56:00 -07:00