PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,992 Commits 1 Branch 0 Tags
32ba8da8a8d615d58f6824d20ddb68ec1e9f076e
Commit Graph

1992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Clark
32ba8da8a8 am 84c27eec: am f7f47d00: Removed unused import android.widget.LinearLayout 
Merge commit '84c27eecddf856544528c4835282ac4c3b3b20af'

* commit '84c27eecddf856544528c4835282ac4c3b3b20af':
  Removed unused import android.widget.LinearLayout
 2010-07-22 10:51:45 -07:00
Ben Clark
84c27eecdd am f7f47d00: Removed unused import android.widget.LinearLayout 
Merge commit 'f7f47d001b2e7faf9aacfcfe546bd209482149b8' into gingerbread-plus-aosp

* commit 'f7f47d001b2e7faf9aacfcfe546bd209482149b8':
  Removed unused import android.widget.LinearLayout
 2010-07-22 10:49:07 -07:00
Ben Clark
f7f47d001b Removed unused import android.widget.LinearLayout 
Change-Id: I904f5e3a2054f99bbc7c685e9d7a805cb621819a
 2010-07-21 21:44:59 +01:00
The Android Open Source Project
5df4b994e5 am a3b8c7a5: merge from open-source master 
Merge commit 'a3b8c7a5e77f1518034a8ab911af405f30c11b06'

* commit 'a3b8c7a5e77f1518034a8ab911af405f30c11b06':
  Remove unused variable and associated import
 2010-07-19 15:20:32 -07:00
The Android Open Source Project
a3b8c7a5e7 merge from open-source master 
Change-Id: I0a74758673231384186e810f7371900a09b73800
 2010-07-19 15:18:45 -07:00
Ben Clark
289244a88e Remove unused variable and associated import 
Change-Id: I5d83cf68c1604b252e860c6b3258654fcae7a589
 2010-07-19 13:03:20 -07:00
The Android Open Source Project
e50496fb35 am be38a39f: merge from open-source master 
Merge commit 'be38a39fc98d8574b747c57fea2aedd5d97fd333'

* commit 'be38a39fc98d8574b747c57fea2aedd5d97fd333':
  Fix window leak problems in settings.
 2010-07-19 13:01:37 -07:00
The Android Open Source Project
be38a39fc9 merge from open-source master 
Change-Id: Ibdfd887cae67bb6eba26e0f4e02765ad5b07e657
 2010-07-19 12:52:09 -07:00
Jiehua.Dai
20108e2ed6 Fix window leak problems in settings. 
There were window leak in the settings application.
These leak happens when an AlertDialog displays, rotate the phone,
then it would cause window leak.

Change-Id: I914897bf657933efea72eeea66076dc288098420
 2010-07-14 11:10:00 +02:00
Irfan Sheriff
97bdc93a3b am 40686ee8: am 15fe0e47: Merge "Allow soft AP settings config before bring up" into gingerbread 
Merge commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f'

* commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f':
  Allow soft AP settings config before bring up
 2010-06-25 19:53:30 -07:00
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
The Android Open Source Project
2d77767fdf am c9d2f15f: merge from froyo-plus-aosp 
Merge commit 'c9d2f15fc5012066b62f5a59aff5c7aaf283c491'

* commit 'c9d2f15fc5012066b62f5a59aff5c7aaf283c491':
  Disabled verbose logging
  replaced deprecated setButton methods
  Replaced deprecated String Constructor
 2010-06-25 14:21:27 -07:00
The Android Open Source Project
c9d2f15fc5 merge from froyo-plus-aosp 
Change-Id: I006987d370377a0222dfc5b4cb24ad6441d717dc
 2010-06-25 10:02: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
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