Commit Graph

1992 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
424b69c63f Merge "Replaced deprecated String Constructor" 2010-06-14 12:13:56 -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
b817cb6e39 merge from open-source master
Change-Id: Ia3beb8e68dd6a8df1b2c8887c0b851b4467b5f79
2010-06-14 11:08:28 -07:00
Jean-Baptiste Queru
3ba01ea0d1 Merge "replaced deprecated getIntent with parseURI" 2010-06-14 10:25:34 -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
e88c863ae1 am a316d99b: am dc2fdd09: (-s ours) Import revised translations 2010-06-10 11:58:56 -07:00
Kenny Root
a316d99b34 am dc2fdd09: (-s ours) Import revised translations
Merge commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd' into kraken

* commit 'dc2fdd091fc23fe4d4001cc5caacdddbd6becddd':
  Import revised translations
2010-06-10 11:54:49 -07: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
b9071e6b83 am 8a0920e6: am a791e2d6: (-s ours) Import revised translations 2010-06-09 23:24:20 -07:00
Kenny Root
8a0920e63c am a791e2d6: (-s ours) Import revised translations
Merge commit 'a791e2d63bfb5218db4890184e68381d4261818f' into kraken

* commit 'a791e2d63bfb5218db4890184e68381d4261818f':
  Import revised translations
2010-06-09 23:19:47 -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
Jaikumar Ganesh
660ad5e3e2 am f58f742f: Merge "Fix bug 2713245 - Remove job queue from BT settings" into kraken 2010-06-07 14:24:53 -07:00
Jaikumar Ganesh
c77005d339 am 68a5bd36: Merge "Changing disconnectHeadset calls." into kraken 2010-06-07 14:24:51 -07:00
Jaikumar Ganesh
f58f742fc0 Merge "Fix bug 2713245 - Remove job queue from BT settings" into kraken 2010-06-07 14:12:25 -07:00
Jaikumar Ganesh
68a5bd361d Merge "Changing disconnectHeadset calls." into kraken 2010-06-07 14:12:01 -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
Adam Powell
f907e0bb89 Fix bug 2713245 - Remove job queue from BT settings
Change-Id: I4e7269474cd270f22b16e9317e933ab87bff4929
2010-06-07 10:52:21 -07:00
Jaikumar Ganesh
8038834f8e Changing disconnectHeadset calls.
Change-Id: I2f058f28a09e983cd42e5a74bb4ffea19f07b880
2010-06-07 10:50:57 -07:00
Christian Mehlmauer
b8eb474b92 Disabled verbose logging
Change-Id: If4612b5c045fb9819ab0668a628933a530606262
2010-06-05 14:42:00 +02: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
Konstantin Lopyrev
9e1580de8e Fix 2599706: Made sure that the user is not asked to confirm his password again after watching the lock pattern tutorial.
Change-Id: I4c1c4e9cd4820d9b8ebd10a2999d21bee6a08ba5
2010-06-01 17:04:04 -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
Jeff Brown
e82843fc10 am 4223830c: am 7c5717c0: am b0bcf9f7: Fix NPE in InstalledAppDetails activity when app not found. 2010-05-28 12:17:15 -07:00
Jeff Brown
4223830c65 am 7c5717c0: am b0bcf9f7: Fix NPE in InstalledAppDetails activity when app not found.
Merge commit '7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c' into kraken

* commit '7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c':
  Fix NPE in InstalledAppDetails activity when app not found.
2010-05-28 12:14:10 -07:00
Jeff Brown
7c5717c064 am b0bcf9f7: Fix NPE in InstalledAppDetails activity when app not found.
Merge commit 'b0bcf9f7f50b56cb15a72be39fe11fe1351992c1' into froyo-plus-aosp

* commit 'b0bcf9f7f50b56cb15a72be39fe11fe1351992c1':
  Fix NPE in InstalledAppDetails activity when app not found.
2010-05-28 12:12:21 -07:00
Michael Chan
fca9d42982 am fa5d73fd: Merge "b/2680057 Fixed a bug where bt won\'t connect when the phone is docked (if Settings wasn\'t running)." into kraken 2010-05-27 23:05:52 -07:00
Michael Chan
fa5d73fdc8 Merge "b/2680057 Fixed a bug where bt won't connect when the phone is docked (if Settings wasn't running)." into kraken 2010-05-27 17:11:24 -07:00
Michael Chan
57d5585595 b/2680057 Fixed a bug where bt won't connect when the phone is docked (if Settings wasn't running).
The fix was to wait for the Bluetooth Headset service to come up before grabbing the settings and connecting.

Change-Id: I57affca2fe7d571c96cfeaf9ffe5439a0b02af45
2010-05-27 17:06:50 -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
Jeff Brown
b0bcf9f7f5 Fix NPE in InstalledAppDetails activity when app not found.
Added some extra checks to ensure that the activity exits from
onCreate, onResume and processMoveMsg promptly when the app
info cannot be refreshed.

Bug: b/2711730
Change-Id: Ied22fadce09326dd33cf201e5e9281990bf3abbd
2010-05-27 14:32:31 -07:00
Irfan Sheriff
dfa18503b6 am 9be3624f: am c1a587c9: am f3373c99: No quotes for password 2010-05-26 13:08:53 -07:00