PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,493 Commits 1 Branch 0 Tags
838c0f2ad07d12f315b51b7ada99281bfbad8f2c
Commit Graph

2493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
e742d42d54 am 41357ba8: am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward 
Merge commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286'

* commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286':
  Import revised translations
 2010-08-24 11:55:38 -07:00
Kenny Root
ebd93b52e6 resolved conflicts for merge of dbdbd152 to master 
Change-Id: Icb172e3d8c2eaec8156bdc37d12efb238054b507
 2010-08-24 10:13:00 -07:00
Jean-Baptiste Queru
41357ba8d6 am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward 
Merge commit '02e731fb6452df796d976cb9e407b210cfffcda5' into gingerbread-plus-aosp

* commit '02e731fb6452df796d976cb9e407b210cfffcda5':
  Import revised translations
 2010-08-23 23:36:55 -07:00
Jean-Baptiste Queru
02e731fb64 merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward 
Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74
 2010-08-23 19:09:14 -07:00
Jaikumar Ganesh
42b0443212 Merge "Match devices by Class for tethering." 2010-08-23 15:58:37 -07:00
Dianne Hackborn
3784d003b8 am 805ad7d1: am 4749fcf7: More tricksy. 
Merge commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d'

* commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d':
  More tricksy.
 2010-08-23 12:01:51 -07:00
Jaikumar Ganesh
8eb4986049 Match devices by Class for tethering. 
Change-Id: I711de3c8d6f6b1dafeec4fb5dde4fa33d997bcca
 2010-08-23 11:49:19 -07:00
Jake Hamby
2cd6aad561 am 2876ad62: am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak." 
Merge commit '2876ad62082207e0e02cbc38b65ce9993cb121bf'

* commit '2876ad62082207e0e02cbc38b65ce9993cb121bf':
  Fix Bluetooth Settings activity memory leak.
 2010-08-21 09:35:49 -07:00
Dianne Hackborn
999d66df26 am 4962c855: am a712c3b7: A couple small settings fixes: 
Merge commit '4962c855b871f1657ca6d90817567203e6863551'

* commit '4962c855b871f1657ca6d90817567203e6863551':
  A couple small settings fixes:
 2010-08-21 09:35:38 -07:00
Dianne Hackborn
dbdbd15296 am e55b0e2e: Fix issue #2895310: Please fix problems with your strings 
Merge commit 'e55b0e2e88adc2be5958d0ae4ea310997aa2002f' into gingerbread-plus-aosp

* commit 'e55b0e2e88adc2be5958d0ae4ea310997aa2002f':
  Fix issue #2895310: Please fix problems with your strings
 2010-08-20 15:15:49 -07:00
Dianne Hackborn
e55b0e2e88 Fix issue #2895310: Please fix problems with your strings 
Make up some numbers.

Change-Id: Ib3d1018282efd4979be8ef22384c9d64e67456e4
 2010-08-20 15:10:26 -07:00
Dianne Hackborn
805ad7d1aa am 4749fcf7: More tricksy. 
Merge commit '4749fcf762de0e34ac28f927501d42555062c521' into gingerbread-plus-aosp

* commit '4749fcf762de0e34ac28f927501d42555062c521':
  More tricksy.
 2010-08-19 18:37:35 -07:00
Dianne Hackborn
4749fcf762 More tricksy. 
Change-Id: I4752344e0eea302ba28e907ff5bd5c20f74a82b7
 2010-08-19 18:21:31 -07:00
Eric Fischer
641ec835c4 Merge "Import Romansh translations." 2010-08-19 12:01:34 -07:00
Amith Yamasani
7385d65817 Fix proguard flags for settings. 
Bug: 2933151
 2010-08-19 10:26:40 -07:00
Erik Ljungberg
d5234bc844 BT: The Phone doesn't "wake up" when trying to pair with it. 
To improve the pairing request usability:
- In the case where a notification shall be used the standard
  notification sound is added
- When the screen is off notification is always used.

Change-Id: I751a7913517c64de5d7ba06d7c17358197d002c5
 2010-08-19 17:47:44 +02:00
Amith Yamasani
d79934731c Refactor settings top level activities to use fragments. 
Added a base class SettingsPreferenceFragment from which the settings activities should
be derived so that they can behave like fragments. It contains some commonly called
utility methods and dialog conversion to DialogFragment.

Some of the top-level activities can be launched directly without the left pane.
Settings.java acts as a proxy activity that contains just that settings fragment without
the left pane.

There are still a lot of second and third level activities that need to be fragmentized.
This is just the first pass to test the 2-pane layout.
 2010-08-18 22:59:33 -07:00
Jake Hamby
2876ad6208 am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak." 
Merge commit '2fcfb28982b84a6383774cfd50d6a963b1a985e1' into gingerbread-plus-aosp

* commit '2fcfb28982b84a6383774cfd50d6a963b1a985e1':
  Fix Bluetooth Settings activity memory leak.
 2010-08-18 19:36:53 -07:00
Jake Hamby
2fcfb28982 Merge " Fix Bluetooth Settings activity memory leak." 2010-08-18 19:29:53 -07:00
Dianne Hackborn
4962c855b8 am a712c3b7: A couple small settings fixes: 
Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp

* commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a':
  A couple small settings fixes:
 2010-08-18 18:42:18 -07:00
Dianne Hackborn
a712c3b7b5 A couple small settings fixes: 
- Correctly position WIFI/GPS charts.
- Start out with running services hidden in case we need to show
  the progress bar.

Change-Id: I8852f334f68f4e9122b5d688d9fd57d0f94d94d8
 2010-08-18 17:47:39 -07:00
Danica Chang
3a9cf03636 Merge "bluetooth tethering" 2010-08-18 16:58:52 -07:00
Eric Fischer
dbd31f29d9 Import Romansh translations. 
Change-Id: I71df0c212e4ef30c94bc36d048226c3216f79e9b
 2010-08-18 16:26:49 -07:00
Eric Fischer
b08adb0032 am e86ec30f: (-s ours) am f8a91b53: Import revised translations. DO NOT MERGE 
Merge commit 'e86ec30f3fc916f32e9c3e58d1f026a10f9b265f'

* commit 'e86ec30f3fc916f32e9c3e58d1f026a10f9b265f':
  Import revised translations.  DO NOT MERGE
 2010-08-18 13:43:18 -07:00
Eric Fischer
e86ec30f3f am f8a91b53: Import revised translations. DO NOT MERGE 
Merge commit 'f8a91b535b05619061dad5870db2318b012bbc0b' into gingerbread-plus-aosp

* commit 'f8a91b535b05619061dad5870db2318b012bbc0b':
  Import revised translations.  DO NOT MERGE
 2010-08-18 13:36:36 -07:00
Danica Chang
32711b6752 bluetooth tethering 
Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d
 2010-08-17 19:07:07 -07:00
Eric Fischer
4216902ba3 Import revised translations. 
Change-Id: I22bb0d58dabccd19a4726c5abf97710f1970c211
 2010-08-17 16:56:21 -07:00
Eric Fischer
f8a91b535b Import revised translations. DO NOT MERGE 
Change-Id: If954fbc7c9ff4898e76e6e4dcde4f9dffdd7cbf2
 2010-08-17 16:45:27 -07:00
thigobr
d4cebee1e4 Fix Bluetooth Settings activity memory leak. 
There were two leaks in Bluetooth Settings: one when rotating the
    phone and other when scanning for bluetooth devices.
 2010-08-17 12:59:41 -03:00
Ben Clark
f2687380dc am 8d62eb4a: am 0008d219: Refactor to remove multiple in-loop Object[]->String[] castings 
Merge commit '8d62eb4a51141f4464ba0b4c510cf0ec4198a56a'

* commit '8d62eb4a51141f4464ba0b4c510cf0ec4198a56a':
  Refactor to remove multiple in-loop Object[]->String[] castings
 2010-08-17 07:51:35 -07:00
Ben Clark
8d62eb4a51 am 0008d219: Refactor to remove multiple in-loop Object[]->String[] castings 
Merge commit '0008d219a2964218477d5bd5f28a848844063c44' into gingerbread-plus-aosp

* commit '0008d219a2964218477d5bd5f28a848844063c44':
  Refactor to remove multiple in-loop Object[]->String[] castings
 2010-08-17 07:48:32 -07:00
Dianne Hackborn
c94e7d1954 am 6ca1da8c: am ff3673c7: Make running services initial update async. 
Merge commit '6ca1da8c97f76f1b07fc70846ae31e22fb72c160'

* commit '6ca1da8c97f76f1b07fc70846ae31e22fb72c160':
  Make running services initial update async.
 2010-08-16 15:18:30 -07:00
Dianne Hackborn
e5b148ba29 am 343158c7: am be5994d2: Some improvements to the battery usage UI: 
Merge commit '343158c797ea12f3f43df2a0ec70c65ada9e6daa'

* commit '343158c797ea12f3f43df2a0ec70c65ada9e6daa':
  Some improvements to the battery usage UI:
 2010-08-16 15:17:36 -07:00
Daisuke Miyakawa
3f1f0393f8 Tiny fix: remove warnings in WifiApiDialog. 
Change-Id: Ifff3dd5d0a98e0be5bbe97c11fe4441bccfa6d09
 2010-08-15 19:34:15 -07:00
Dianne Hackborn
6ca1da8c97 am ff3673c7: Make running services initial update async. 
Merge commit 'ff3673c7f477b1d78e64a8bc28754552dcdc8826' into gingerbread-plus-aosp

* commit 'ff3673c7f477b1d78e64a8bc28754552dcdc8826':
  Make running services initial update async.
 2010-08-15 17:37:14 -07:00
Dianne Hackborn
ff3673c7f4 Make running services initial update async. 
Also fix the value show for an app's awake time.

Change-Id: I801681d3a1d47a6bb1f3fb8cc5b0ef009201146f
 2010-08-15 17:29:07 -07:00
Dianne Hackborn
343158c797 am be5994d2: Some improvements to the battery usage UI: 
Merge commit 'be5994d20152c7194aac79eb8152240655fd3373' into gingerbread-plus-aosp

* commit 'be5994d20152c7194aac79eb8152240655fd3373':
  Some improvements to the battery usage UI:
 2010-08-13 16:00:49 -07:00
Dianne Hackborn
be5994d201 Some improvements to the battery usage UI: 
- Show wake lock usage in the battery history.
- Show WIFI usage in the battery history.
- Show the amount an app has held a wake lock in the app details.
- Also fix service run time computation in running services.

Change-Id: I5aa959857f83808fbc709f65204f59bbfb73935b
 2010-08-13 14:22:34 -07:00
Daisuke Miyakawa
f883073082 Merge "Create LocalePickerFragment for fragmentizing LocalePicker Activity." 2010-08-13 13:52:43 -07:00
Daisuke Miyakawa
c81adf598f Create LocalePickerFragment for fragmentizing LocalePicker Activity. 
Need to add proguard.flag, as the Activity crashes without it.

Change-Id: Icbc75be4a4183920ed472ac64cc509115260f865
 2010-08-13 13:36:51 -07:00
Jean-Baptiste Queru
54c0837bbe am f9cfab20: Fix build - add missing import 
Merge commit 'f9cfab203a61346b86373a91ca239b624c7106c7'

* commit 'f9cfab203a61346b86373a91ca239b624c7106c7':
  Fix build - add missing import
 2010-08-12 14:34:33 -07:00
Jean-Baptiste Queru
f9cfab203a Fix build - add missing import 
Change-Id: I31c5db903532c68b42760f29b3fbb46c7c7854f8
 2010-08-12 14:30:26 -07:00
Daisuke Miyakawa
6a3e48c035 Merge "Remove LocalePickerInSetupWizard." 2010-08-12 12:22:05 -07:00
Irfan Sheriff
ccba07f522 Merge "asynchronous API changes" 2010-08-12 07:59:25 -07:00
Dianne Hackborn
b2d2a6c63f am 0e404872: am 36735462: More version info. 
Merge commit '0e4048721980926ed9f78de955658eb5d07dcfc4'

* commit '0e4048721980926ed9f78de955658eb5d07dcfc4':
  More version info.
 2010-08-11 22:34:43 -07:00
Dianne Hackborn
0e40487219 am 36735462: More version info. 
Merge commit '3673546205ebf1b4c83c212c1032eea38c8adbe7' into gingerbread-plus-aosp

* commit '3673546205ebf1b4c83c212c1032eea38c8adbe7':
  More version info.
 2010-08-11 22:32:15 -07:00
Dianne Hackborn
3673546205 More version info. 
Change-Id: I006951028135e95ce7bb2463f00649a691b5f615
 2010-08-11 22:28:29 -07:00
Daisuke Miyakawa
4ced172492 Remove LocalePickerInSetupWizard. 
Currently LocalePicker and LocalePickerInSetupWizard are identical and
the latter is not used at all. Let's remove it.

Change-Id: I951433350a7ead5c0b7036e84b609424ad0d0898
 2010-08-11 18:12:32 -07:00
Irfan Sheriff
d821c7adcc asynchronous API changes 
Use the simplified connect, save & remove async API

Change-Id: I5754f1772163bcb4ab0ae18cab3747e17c21531a
 2010-08-11 08:32:28 -07:00
Eric Fischer
abf87dca0a Merge "Import revised translations." 2010-08-10 12:20:53 -07:00