Irfan Sheriff
40686ee81f
am 15fe0e47
: Merge "Allow soft AP settings config before bring up" into gingerbread
...
Merge commit '15fe0e47958d248300c2f26a463172181b137aca' into gingerbread-plus-aosp
* commit '15fe0e47958d248300c2f26a463172181b137aca':
Allow soft AP settings config before bring up
2010-06-25 19:51:46 -07:00
Irfan Sheriff
15fe0e4795
Merge "Allow soft AP settings config before bring up" into gingerbread
2010-06-25 19:50:14 -07:00
Dianne Hackborn
0ba1940b13
am 15f9939b
: am c01b0c83
: Allow user to see and stop heavy-weight processes.
...
Merge commit '15f9939b84542319fee7039b55dacb77d1fc2789'
* commit '15f9939b84542319fee7039b55dacb77d1fc2789':
Allow user to see and stop heavy-weight processes.
2010-06-24 12:44:37 -07:00
Dianne Hackborn
15f9939b84
am c01b0c83
: Allow user to see and stop heavy-weight processes.
...
Merge commit 'c01b0c83fca571229621d16b757a46dc0fae7dfe' into gingerbread-plus-aosp
* commit 'c01b0c83fca571229621d16b757a46dc0fae7dfe':
Allow user to see and stop heavy-weight processes.
2010-06-24 12:42:58 -07:00
Dianne Hackborn
c01b0c83fc
Allow user to see and stop heavy-weight processes.
...
Change-Id: If5caed3972ab03a54fbf8c459cdfc136e4bdc020
2010-06-24 12:38:33 -07:00
Irfan Sheriff
bb480bbb92
Allow soft AP settings config before bring up
...
Bug: 2538623
Change-Id: I4b927deb0e4981c164744b85e5c85c3fc95a31eb
2010-06-24 12:04:36 -07:00
Adam Powell
792d2132e4
Add keyboard support to bluetooth settings.
...
Change-Id: I8fe41056acd074374cd249bfd0be6034f2614d37
2010-06-22 13:29:48 -07:00
Kenny Root
05c2b96f42
am 4e012037
: Import revised translations
...
Merge commit '4e01203746710646227470390d4a9f7fb52c6238' into froyo-plus-aosp
* commit '4e01203746710646227470390d4a9f7fb52c6238':
Import revised translations
2010-06-21 11:18:33 -07:00
Kenny Root
4e01203746
Import revised translations
...
Change-Id: I170f4347b73055ce204d75cfa1bef5cc22b928b1
2010-06-21 11:04:50 -07:00
Kenny Root
08c1d6c480
am db751db4
: Import revised translations
...
Merge commit 'db751db4c919ea4ab981d52017b9741d386dad19' into froyo-plus-aosp
* commit 'db751db4c919ea4ab981d52017b9741d386dad19':
Import revised translations
2010-06-21 09:14:55 -07:00
Kenny Root
db751db4c9
Import revised translations
...
Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
2010-06-20 19:00:54 -07:00
The Android Open Source Project
fa3384898a
am 73550d28
: merge from froyo-plus-aosp
...
Merge commit '73550d28df4b7ee2faa39cc4b1b4cc854343632a'
* commit '73550d28df4b7ee2faa39cc4b1b4cc854343632a':
Settings: Add a hook for operator or vendor specific settings.
replaced deprecated getIntent with parseURI
2010-06-14 11:51:56 -07:00
The Android Open Source Project
73550d28df
merge from froyo-plus-aosp
...
Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a
2010-06-14 11:48:15 -07:00
The Android Open Source Project
00c406364e
merge from open-source master
...
Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
2010-06-11 13:31:28 -07:00
Dianne Hackborn
ccc94380dc
am ea38e678
: Show history of battery level.
...
Merge commit 'ea38e678537cf740b5f30c1d69c7a332e98cdd2c'
* commit 'ea38e678537cf740b5f30c1d69c7a332e98cdd2c':
Show history of battery level.
2010-06-11 12:57:17 -07:00
Dianne Hackborn
ea38e67853
Show history of battery level.
...
Also clean up to remove dead code for running services and old
battery usage UI.
Finally some string improvements from Roy.
Change-Id: I8765a4c744b92edd1505f14c47fea57b918e5d7b
2010-06-11 12:46:21 -07:00
Anders Hammar1
b2dd90383b
Settings: Add a hook for operator or vendor specific settings.
...
The Settings application now provides a hook that can be used by an
operator or a vendor specific application to add an activity of choice
in the settings menu.
Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
2010-06-11 14:27:29 +02:00
Kenny Root
97ece591a6
am dc2fdd09
: Import revised translations
...
Merge commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd' into froyo-plus-aosp
* commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd':
Import revised translations
2010-06-10 11:48:13 -07:00
Kenny Root
dc2fdd091f
Import revised translations
...
Change-Id: I927a602963d383fbfe12d4b897a2e86bf1783f34
2010-06-10 11:37:35 -07:00
Kenny Root
88f6b989d2
am a791e2d6
: Import revised translations
...
Merge commit 'a791e2d63bfb5218db4890184e68381d4261818f' into froyo-plus-aosp
* commit 'a791e2d63bfb5218db4890184e68381d4261818f':
Import revised translations
2010-06-09 23:04:13 -07:00
Kenny Root
a791e2d63b
Import revised translations
...
Change-Id: Ib63294fbc8fedc0517f38bbffd4c0fe536866bdc
2010-06-09 22:59:20 -07:00
Konstantin Lopyrev
2df65e4fac
Adding support for minimum non-letter characters.
...
Change-Id: I1eb96e3b88a368f1d92acdf71974fcd8fda1caab
2010-06-07 18:35:10 -07:00
Dianne Hackborn
b364d0508e
am 728ac353
: New Running Services UI.
2010-06-07 12:57:00 -07:00
Dianne Hackborn
728ac35373
New Running Services UI.
...
This introduces a simplified (thanks, dsandler!) UI for Running Services,
collapsing the groups of apps and processes into single lines. Tapping
on a line moves to a new activity showing details on that group, where the
stop functionality is now available.
This UI is now also integrated into Manage Applications, as the Running
tab. You no longer get a really confusing, misleading, scary list of
every package that appears to be laying around for some reason.
The code was also re-organized, to put everything related to Manage
Applications and Running Services under its own package.
There is still some clean-up -- some performance improvements (such as
not re-computing the world when we switch to the details view), and if
this looks good then eradicating the old running services UI.
Change-Id: I3fc059c18060600742cab5b455d11ff74bf45ae3
2010-06-07 12:33:53 -07:00
Kenny Root
13cccc1b82
am 2486572b
: am e4c0cd6d
: am 365ef4a0
: Update strings for backup
2010-06-03 17:17:37 -07:00
Kenny Root
2486572bd6
am e4c0cd6d
: am 365ef4a0
: Update strings for backup
...
Merge commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86' into kraken
* commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86':
Update strings for backup
2010-06-03 17:09:28 -07:00
Kenny Root
e4c0cd6d8c
am 365ef4a0
: Update strings for backup
...
Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp
* commit '365ef4a095189573b67573f6750f5891c11b7895':
Update strings for backup
2010-06-03 17:05:06 -07:00
Kenny Root
365ef4a095
Update strings for backup
...
Change-Id: Icfc39bd1dd0bc38ac5fde300aeb1e8822825d57a
2010-06-03 16:42:00 -07:00
Kenny Root
9517554534
am a262b5d1
: am 273464d5
: am aa1f8aee
: Clarify backup setting
2010-06-03 15:10:59 -07:00
Kenny Root
a262b5d1a0
am 273464d5
: am aa1f8aee
: Clarify backup setting
...
Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken
* commit '273464d5a1369a784eebeebaa4a4f8b4371b7699':
Clarify backup setting
2010-06-03 15:07:14 -07:00
Kenny Root
273464d5a1
am aa1f8aee
: Clarify backup setting
...
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp
* commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
Clarify backup setting
2010-06-03 15:02:13 -07:00
Kenny Root
aa1f8aeeea
Clarify backup setting
...
Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
2010-06-03 13:42:12 -07:00
Irfan Sheriff
3bf2d42490
am ca61c255
: am a4966840
: am de3e5665
: Add phase2 authentication settings
2010-06-03 11:17:36 -07:00
Irfan Sheriff
ca61c25578
am a4966840
: am de3e5665
: Add phase2 authentication settings
...
Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken
* commit 'a496684019497395b71c6d460501197a74e21e0e':
Add phase2 authentication settings
2010-06-03 11:14:40 -07:00
Irfan Sheriff
a496684019
am de3e5665
: Add phase2 authentication settings
...
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp
* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
Add phase2 authentication settings
2010-06-03 11:13:21 -07:00
Irfan Sheriff
de3e56650d
Add phase2 authentication settings
...
Bug: 2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
2010-06-02 16:31:20 -07:00
Amith Yamasani
e7739d1ab5
Added an Input Method selector in Language settings
...
Bug: 2132207 - Settings UI has no way to change IME
2010-06-01 10:22:30 -07:00
Konstantin Lopyrev
57fbf694a5
Change I546ee2fb: Fix 2677197: Adding minimum complex character support.
...
Change-Id: I5590ec2743b84e34098871507dbcc2f49e5a4e9f
2010-05-27 16:04:49 -07:00
The Android Open Source Project
ba10561bab
am b6c756d5
: am 50c7f2d9
: merge from open-source master
2010-05-19 09:17:07 -07:00
The Android Open Source Project
b6c756d521
am 50c7f2d9
: merge from open-source master
...
Merge commit '50c7f2d92a8100982c49027058fb05069e4a1e2a' into kraken
* commit '50c7f2d92a8100982c49027058fb05069e4a1e2a':
A button in the master clear information screen was partly hidden.
2010-05-19 09:14:10 -07:00
The Android Open Source Project
50c7f2d92a
merge from open-source master
...
Change-Id: I5698914cf9093696ad851412a510a99419989d17
2010-05-19 08:30:08 -07:00
Dianne Hackborn
777e06c164
am 3f253cf2
: am fcc577b2
: am f9762a2c
: Fix issue #2694643 : Remove/Resolve STOPSHIP
2010-05-18 18:28:02 -07:00
Dianne Hackborn
3f253cf2d7
am fcc577b2
: am f9762a2c
: Fix issue #2694643 : Remove/Resolve STOPSHIP
...
Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken
* commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef':
Fix issue #2694643 : Remove/Resolve STOPSHIP
2010-05-18 15:28:29 -07:00
Dianne Hackborn
fcc577b2a1
am f9762a2c
: Fix issue #2694643 : Remove/Resolve STOPSHIP
...
Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp
* commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624':
Fix issue #2694643 : Remove/Resolve STOPSHIP
2010-05-18 15:26:17 -07:00
Dianne Hackborn
f9762a2c39
Fix issue #2694643 : Remove/Resolve STOPSHIP
...
*poof*
Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
2010-05-18 15:22:32 -07:00
Henrik Tuszynski
de6007cbf8
A button in the master clear information screen was partly hidden.
...
The master reset button was partially hidden in landscape mode.
This change nests the current layout in a ScrollView making the
layout scrollable.
Change-Id: I2f7b8a222e3a25930b134314640b1c765b964254
2010-05-18 09:25:05 +02:00
Kenny Root
7a4cff13c9
am 28b245c0
: Import revised translations
...
Merge commit '28b245c01d49b7710d1a918849fe8f159e8f43b5' into froyo-plus-aosp
* commit '28b245c01d49b7710d1a918849fe8f159e8f43b5':
Import revised translations
2010-05-17 11:45:04 -07:00
Kenny Root
28b245c01d
Import revised translations
...
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
2010-05-17 11:42:19 -07:00
Konstantin Lopyrev
28efa02104
Making the choose password strings clearer
...
Change-Id: Ib693145542972863677fa0a383278e95abfb239d
2010-05-13 15:58:46 -07:00
Konstantin Lopyrev
015c186a24
Fix 2673731: Added password history
...
Change-Id: I6198833e099ec1f33309dc26b28e0fd4a6edb288
2010-05-12 17:16:24 -07:00