Commit Graph

2225 Commits

Author SHA1 Message Date
Irfan Sheriff
bb480bbb92 Allow soft AP settings config before bring up
Bug: 2538623
Change-Id: I4b927deb0e4981c164744b85e5c85c3fc95a31eb
2010-06-24 12:04:36 -07:00
Dianne Hackborn
83a41f3613 am fe53d788: am 12fd447d: More battery level improvements.
Merge commit 'fe53d78858c4d853cb82394d44740769241f70bf'

* commit 'fe53d78858c4d853cb82394d44740769241f70bf':
  More battery level improvements.
2010-06-23 12:41:20 -07:00
Dianne Hackborn
0b5f87d92f am 0bd7082e: am f4cf7de6: Merge "Small improvements to bettery level graphing." into gingerbread
Merge commit '0bd7082ef809de2aec50fc347ee0974dbc52d764'

* commit '0bd7082ef809de2aec50fc347ee0974dbc52d764':
  Small improvements to bettery level graphing.
2010-06-23 10:17:31 -07:00
Dianne Hackborn
fe53d78858 am 12fd447d: More battery level improvements.
Merge commit '12fd447d6f46b0c06072b0e9735589bf14cc53f6' into gingerbread-plus-aosp

* commit '12fd447d6f46b0c06072b0e9735589bf14cc53f6':
  More battery level improvements.
2010-06-22 18:04:01 -07:00
Dianne Hackborn
12fd447d6f More battery level improvements.
Take into account durations when there is no data due to
a reboot.  Also show times when charging and screen is on.

Change-Id: I84e75efb3339b0596bea3bbca9dbea6d9f864537
2010-06-22 16:08:50 -07:00
Adam Powell
792d2132e4 Add keyboard support to bluetooth settings.
Change-Id: I8fe41056acd074374cd249bfd0be6034f2614d37
2010-06-22 13:29:48 -07:00
Dianne Hackborn
0bd7082ef8 am f4cf7de6: Merge "Small improvements to bettery level graphing." into gingerbread
Merge commit 'f4cf7de67206be171bdc97f3f0e86cbeabd322fd' into gingerbread-plus-aosp

* commit 'f4cf7de67206be171bdc97f3f0e86cbeabd322fd':
  Small improvements to bettery level graphing.
2010-06-21 15:05:26 -07:00
Dianne Hackborn
f4cf7de672 Merge "Small improvements to bettery level graphing." into gingerbread 2010-06-21 15:04:04 -07:00
Dianne Hackborn
b9b7e5c863 Small improvements to bettery level graphing.
Deal with data that doesn't start with updates; don't try to
make lines horizontal (a battery doesn't change is a battery
that is dead!).

Change-Id: I10a7938a04cc5ed5e92a55857851d8d70b64c3b6
2010-06-21 14:42:49 -07:00
Kenny Root
a8dddb0faa am f8865183: am 41e7a3cd: am 4e012037: (-s ours) Import revised translations
Merge commit 'f88651835f2c750d5f7ff286a7b7803f2544bec7'

* commit 'f88651835f2c750d5f7ff286a7b7803f2544bec7':
  Import revised translations
2010-06-21 13:48:00 -07:00
Kenny Root
f88651835f am 41e7a3cd: am 4e012037: (-s ours) Import revised translations
Merge commit '41e7a3cd1e012e233ce69692d84356ed7f73f6d6' into gingerbread-plus-aosp

* commit '41e7a3cd1e012e233ce69692d84356ed7f73f6d6':
  Import revised translations
2010-06-21 13:12:02 -07:00
Kenny Root
41e7a3cd1e am 4e012037: (-s ours) Import revised translations
Merge commit '4e01203746710646227470390d4a9f7fb52c6238' into gingerbread

* commit '4e01203746710646227470390d4a9f7fb52c6238':
  Import revised translations
2010-06-21 13:09:32 -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
4c4c961195 am eda02799: am a4b2756f: am db751db4: (-s ours) Import revised translations
Merge commit 'eda027990897858840753c16c5e3b47a4979a1e6'

* commit 'eda027990897858840753c16c5e3b47a4979a1e6':
  Import revised translations
2010-06-21 10:16:39 -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
eda0279908 am a4b2756f: am db751db4: (-s ours) Import revised translations
Merge commit 'a4b2756f08740b1e7987cdd7bbafb60c84893d26' into gingerbread-plus-aosp

* commit 'a4b2756f08740b1e7987cdd7bbafb60c84893d26':
  Import revised translations
2010-06-21 09:08:46 -07:00
Kenny Root
a4b2756f08 am db751db4: (-s ours) Import revised translations
Merge commit 'db751db4c919ea4ab981d52017b9741d386dad19' into gingerbread

* commit 'db751db4c919ea4ab981d52017b9741d386dad19':
  Import revised translations
2010-06-21 09:02:02 -07:00
Kenny Root
db751db4c9 Import revised translations
Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
2010-06-20 19:00:54 -07:00
Robert Greenwalt
5a88d4bd11 Merge "Don't enable USB Tethering UI for monkeys." 2010-06-17 15:16:32 -07:00
Dianne Hackborn
a082f1bb32 am fffb1dff: am 2f92074b: Merge "Improve battery chart, fuel gauge now shows time since charged." into gingerbread
Merge commit 'fffb1dffd44decffbff74815b4923e82a8e6a29c'

* commit 'fffb1dffd44decffbff74815b4923e82a8e6a29c':
  Improve battery chart, fuel gauge now shows time since charged.
2010-06-16 19:55:22 -07:00
Dianne Hackborn
db9c13f2e5 am a5edf683: am 4f0e5350: Improve battery chart, fuel gauge now shows time since charged.
Merge commit 'a5edf6834627c57d9674dd50f01dd3755541d8b1'

* commit 'a5edf6834627c57d9674dd50f01dd3755541d8b1':
  Improve battery chart, fuel gauge now shows time since charged.
2010-06-16 19:55:18 -07:00
Dianne Hackborn
fffb1dffd4 am 2f92074b: Merge "Improve battery chart, fuel gauge now shows time since charged." into gingerbread
Merge commit '2f92074b4a4878f572be9cd39231654e1ee9003c' into gingerbread-plus-aosp

* commit '2f92074b4a4878f572be9cd39231654e1ee9003c':
  Improve battery chart, fuel gauge now shows time since charged.
2010-06-16 19:33:51 -07:00
Dianne Hackborn
2f92074b4a Merge "Improve battery chart, fuel gauge now shows time since charged." into gingerbread 2010-06-16 19:32:09 -07:00
Dianne Hackborn
d342c0685d Improve battery chart, fuel gauge now shows time since charged.
Switch default stats to new time since charged.  Update to follow
API changes.  Improve the battery history chart.

Change-Id: I7de4f09ae5638ec3a034745244082e51b1369929
2010-06-16 19:31:32 -07:00
Dianne Hackborn
a5edf68346 am 4f0e5350: Improve battery chart, fuel gauge now shows time since charged.
Merge commit '4f0e5350fccd78bf881b938aaf0f484d135829a0' into gingerbread-plus-aosp

* commit '4f0e5350fccd78bf881b938aaf0f484d135829a0':
  Improve battery chart, fuel gauge now shows time since charged.
2010-06-16 18:55:14 -07:00
Dianne Hackborn
4f0e5350fc Improve battery chart, fuel gauge now shows time since charged.
Switch default stats to new time since charged.  Update to follow
API changes.  Improve the battery history chart.
2010-06-16 18:45:07 -07:00
Robert Greenwalt
ad40f5e917 Don't enable USB Tethering UI for monkeys.
If the monkeys turn on USB tethering they kill their usb connection
and we lose the results of the run. Fix it by not showing that UI
during monkey runs.

bug:2679627
Change-Id: I7bb476a2d60c97dc9d3922d317fdcb586d0c7aec
2010-06-16 16:10:01 -07:00
The Android Open Source Project
8d770c707b merge from open-source master
Change-Id: I5d1276f8343d9f590616dc2ab91e0164b2d31426
2010-06-15 09:36:38 -07:00
Jean-Baptiste Queru
2d40cdb894 Merge "Disabled verbose logging" 2010-06-14 16:39:36 -07:00
The Android Open Source Project
5b6a9a8f00 ignore from open-source master
Change-Id: I1b8bdb583dc0ad66b920f203490aa491d1e1bfb2
2010-06-14 14:33:13 -07:00
The Android Open Source Project
c7984e5d07 merge from open-source master
Change-Id: Iaaf6c1098fc0c5a44a7450d790ccaf2b1d2f64bb
2010-06-14 14:30:58 -07:00
Jean-Baptiste Queru
476bc5af86 Merge "replaced deprecated setButton methods" 2010-06-14 12:18:24 -07:00
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