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

2302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
0b5b53e9ed am ddaf8f49: (-s ours) am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c'

* commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c':
  Import revised translations.  DO NOT MERGE
 2010-09-30 18:13:01 -07:00
Freeman Ng
ab5c381222 keep screen on in setup wizard datetime and wifi settings activities 
bug: 3052067

Change-Id: I5378a5f9afd90e6aaadb25e0284188c25dce6b2a
 2010-09-30 17:32:01 -07:00
Eric Fischer
ddaf8f490f am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3' into gingerbread-plus-aosp

* commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3':
  Import revised translations.  DO NOT MERGE
 2010-09-30 15:58:20 -07:00
Eric Fischer
f20931bc56 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:48:14 -07:00
Ying Wang
c845c6db98 Fix proguard flag file dependency. 
Change-Id: I32004f93fe66f54647f1c93125425a9646431070
 2010-09-30 13:23:20 -07:00
Ken Wakasa
3cd9ddda0a am bc692e83: am 2d6c0b0d: Update strings for physical keyboard settings. 
Merge commit 'bc692e83c4b3bcd6c782935bcd1aff50d23143d0'

* commit 'bc692e83c4b3bcd6c782935bcd1aff50d23143d0':
  Update strings for physical keyboard settings.
 2010-09-30 11:29:31 -07:00
Gilles Debunne
e749ddb98d am 345fbf92: am a63b08d9: New assets for power widget: gps, sync 
Merge commit '345fbf926aba9dc743a58ace88545c030a1f43f4'

* commit '345fbf926aba9dc743a58ace88545c030a1f43f4':
  New assets for power widget: gps, sync
 2010-09-30 11:29:28 -07:00
Gilles Debunne
a6660211b3 am a48d2dbe: am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread 
Merge commit 'a48d2dbeb2691744ec42c3c9fc64f7d17fda357e'

* commit 'a48d2dbeb2691744ec42c3c9fc64f7d17fda357e':
  New assets (wifi, bluetooth...)
 2010-09-30 11:00:10 -07:00
Eric Fischer
9fc1f468f4 resolved conflicts for merge of cf18672a to master 
Change-Id: I87a7ef635166f4f90205a4117cbdec8447471af1
 2010-09-30 10:56:10 -07:00
Ken Wakasa
bc692e83c4 am 2d6c0b0d: Update strings for physical keyboard settings. 
Merge commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1' into gingerbread-plus-aosp

* commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1':
  Update strings for physical keyboard settings.
 2010-09-30 10:10:29 -07:00
Gilles Debunne
345fbf926a am a63b08d9: New assets for power widget: gps, sync 
Merge commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85' into gingerbread-plus-aosp

* commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85':
  New assets for power widget: gps, sync
 2010-09-30 10:08:43 -07:00
Ken Wakasa
2d6c0b0d77 Update strings for physical keyboard settings. 
bug: 2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
 2010-09-30 12:52:52 +09:00
Ken Wakasa
6d5b8951b1 Merge commit '47ad0cf3' into manualmerge 
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
 2010-09-30 11:54:31 +09:00
Gilles Debunne
a63b08d9c8 New assets for power widget: gps, sync 
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
 2010-09-29 16:21:19 -07:00
Daisuke Miyakawa
3b6aa41cce Improve UI of WifiSettingsForXL 
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
 2010-09-29 16:09:42 -07:00
Eric Fischer
3388aac10a Import revised translations. DO NOT MERGE 
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
 2010-09-29 14:36:34 -07:00
Gilles Debunne
a48d2dbeb2 am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread 
Merge commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp

* commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4':
  New assets (wifi, bluetooth...)
 2010-09-29 12:20:36 -07:00
Gilles Debunne
98289826e6 Merge "New assets (wifi, bluetooth...)" into gingerbread 2010-09-29 12:18:13 -07:00
Eric Fischer
cf18672acf am 5698a75f: Split strings with SD card references into variations. 
Merge commit '5698a75f15526a38ee8e0b647d05e4ee358c575a' into gingerbread-plus-aosp

* commit '5698a75f15526a38ee8e0b647d05e4ee358c575a':
  Split strings with SD card references into variations.
 2010-09-29 12:17:20 -07:00
Gilles Debunne
5fb48a2539 New assets (wifi, bluetooth...) 
Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
 2010-09-29 12:10:37 -07:00
Nick Pelly
d83aaf28bc resolved conflicts for merge of 1ff9ad3f to master 
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
 2010-09-29 12:10:35 -07:00
Eric Fischer
5698a75f15 Split strings with SD card references into variations. 
Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
 2010-09-29 12:09:06 -07:00
Ken Wakasa
47ad0cf3bc am d2c3f37f: Revise the Language & keyboard settings layout. 
Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp

* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
  Revise the Language & keyboard settings layout.
 2010-09-29 09:58:01 -07:00
Ken Wakasa
d2c3f37fa4 Revise the Language & keyboard settings layout. 
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
 2010-09-29 23:52:02 +09:00
Nick Pelly
1ff9ad3fb4 am 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbread 
Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp

* commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4':
  Add NFC checkbox to Settings app.
 2010-09-28 22:34:42 -07:00
Nick Pelly
48ad5dfe31 Merge "Add NFC checkbox to Settings app." into gingerbread 2010-09-28 22:32:51 -07:00
Nick Pelly
ad50ba065d Add NFC checkbox to Settings app. 
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Heavily modified to remove dead code.

Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
 2010-09-28 21:26:50 -07:00
Jaikumar Ganesh
5809d33296 Update code for public Bluetooth APIs 
Change-Id: Iab22e4ae3206f9085b2d53b8b18dc2abd6197226
 2010-09-28 17:53:02 -07:00
Daisuke Miyakawa
097981df93 Merge "Fix misc problems happening in SetupWizard XL" 2010-09-28 16:06:44 -07:00
Daisuke Miyakawa
5d3c5cb9d0 Fix misc problems happening in SetupWizard XL 
Change-Id: I6ba0813f36625de3d86543953972869657be50be
 2010-09-28 16:04:08 -07:00
Chris Palmer
3e126474e9 am e2ab4597: am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread 
Merge commit 'e2ab45972af13c30bb98848813313603670c8965'

* commit 'e2ab45972af13c30bb98848813313603670c8965':
  Improve the add-device-admin layout.
 2010-09-28 13:58:03 -07:00
Daisuke Miyakawa
25af150c98 Remove OnStateListener and FragmentStarter. 
Those interfaces aren't available any more, as we make Settings
inherit PreferenceActivity.

Bug: 3034757
Change-Id: I2f778a12168e3033291d6935bcc73637e7c78c0b
 2010-09-28 12:12:11 -07:00
Amith Yamasani
379d9b05cf Fix launching of specific settings. 2010-09-28 11:46:49 -07:00
Chris Palmer
e2ab45972a am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread 
Merge commit '88fdee27e97900173be2b1f4f86c25a7c381969c' into gingerbread-plus-aosp

* commit '88fdee27e97900173be2b1f4f86c25a7c381969c':
  Improve the add-device-admin layout.
 2010-09-28 10:44:16 -07:00
Chris Palmer
88fdee27e9 Merge "Improve the add-device-admin layout." into gingerbread 2010-09-28 10:34:43 -07:00
Chris Palmer
51794a05ad Improve the add-device-admin layout. 
Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.

Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
 2010-09-28 10:32:49 -07:00
Winson Chung
6021a81381 am ca76166c: am 0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread 
Merge commit 'ca76166c705dc78e5a186a9a41f324ba70f0a938'

* commit 'ca76166c705dc78e5a186a9a41f324ba70f0a938':
  Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
 2010-09-27 21:03:10 -07:00
Winson Chung
ca76166c70 am 0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread 
Merge commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130' into gingerbread-plus-aosp

* commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130':
  Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
 2010-09-27 15:09:08 -07:00
Winson Chung
0adb8460bc Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread 2010-09-27 15:06:47 -07:00
Eric Fischer
d6f455cf6d am 2d68f1b5: (-s ours) am 54e21852: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit '2d68f1b56b4146c5203cd793fb64d8e3a8c2da8d'

* commit '2d68f1b56b4146c5203cd793fb64d8e3a8c2da8d':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 14:39:40 -07:00
Winson Chung
9a294912ad Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab 
Change-Id: I5c18b916b09979117e4b746f521a81ca554903b4
 2010-09-27 14:34:48 -07:00
Eric Fischer
2d68f1b56b am 54e21852: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp

* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 12:33:33 -07:00
Eric Fischer
54e21852f2 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 12:27:55 -07:00
Eric Fischer
b9e77aacd1 Trim unwanted whitespace from translations. DO NOT MERGE 
Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7
 2010-09-27 12:21:49 -07:00
Amith Yamasani
2c0698162e am 38f331be: am f8093b33: Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread 
Merge commit '38f331bece1e8c1c06ba51ee5a4a9ffc5615495b'

* commit '38f331bece1e8c1c06ba51ee5a4a9ffc5615495b':
  Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
 2010-09-27 12:08:23 -07:00
Amith Yamasani
38f331bece am f8093b33: Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread 
Merge commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8' into gingerbread-plus-aosp

* commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8':
  Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
 2010-09-27 11:52:39 -07:00
Amith Yamasani
f8093b330a Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread 2010-09-27 11:20:52 -07:00
Amith Yamasani
740edeaa42 Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly. 
Earlier refactoring seems to have messed it up. Added a position value to the state trackers.

Bug: 2980926

Change-Id: I31df4b1ae0b835d801d67747154594299498c4cf
 2010-09-27 11:20:00 -07:00
Daisuke Miyakawa
fe3b6bea01 Disable Status bar in SetupWizard XL. 
Bug: 3005211
Change-Id: I468b7d45aceda8fbdc72f723c95c3818c8da20f5
 2010-09-27 10:38:12 -07:00
Jean-Baptiste Queru
2ae97092c4 am 4d34b227: (-s ours) am 32d54b19: reconcile froyo-release into gingerbread 
Merge commit '4d34b227b482b702b8640d7307cdb7358cd1c362'

* commit '4d34b227b482b702b8640d7307cdb7358cd1c362':
  Remove Search from the system Settings app DO NOT MERGE
 2010-09-26 17:54:32 -07:00