PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,462 Commits 1 Branch 0 Tags
26a1f898e04ca68dc8d1a58d15e9f901b09c90e2
Commit Graph

3462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Hamby
93d419a290 am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings" 
* commit '47cb175396c8b020eded62d6c2293b777f20932b':
  Fixed a memory leak in the bluetooth settings
 2011-02-04 17:49:01 -08:00
Jake Hamby
47cb175396 am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings" 
* commit '1798fc049eda5f6fd14be3a369eebe81c851abd2':
  Fixed a memory leak in the bluetooth settings
 2011-02-04 16:20:15 -08:00
Jake Hamby
1798fc049e Merge "Fixed a memory leak in the bluetooth settings" 2011-02-04 16:12:54 -08:00
Lorenzo Colitti
a7e587fc8d Support configuring the protocol in APN settings. 
Change-Id: I435061a631bdb2f58935af607abf8cd7c5d252ba
 2011-02-04 13:17:15 -08:00
satok
82131332d1 Merge "Do not reset IME Subtype in InputMethodConfig fragment" 2011-02-03 19:34:35 -08:00
satok
d7973d1c0a Do not reset IME Subtype in InputMethodConfig fragment 
Bug: 3415292

Change-Id: Ic9a27982402c6bfd747960d32cce13f3856545da
 2011-02-04 12:29:17 +09:00
Jim Miller
1d8c91faa7 am 78713aed: Fix 3419077: implement new volume control in Settings. 
* commit '78713aed9e23fbf2f89edae87b2ba9e1387104ff':
  Fix 3419077: implement new volume control in Settings.
 2011-02-03 18:42:11 -08:00
Jim Miller
78713aed9e Fix 3419077: implement new volume control in Settings. 
Change-Id: Ia4b803315382d59ae231c26187afaceb69397952
 2011-02-03 18:20:23 -08:00
Daisuke Miyakawa
d5c52ca56a Remove unnecessary flag. 
Bug: 3415073
Change-Id: I01d8c958a495bd7d9376304de1098b473b56a091
 2011-02-03 18:18:31 -08:00
Justin Ho
683d8a2137 am a9d8046c: Updated icons in settings 
* commit 'a9d8046c490a2295d6bda1e5eb4bd49838a5c064':
  Updated icons in settings
 2011-02-03 15:33:45 -08:00
Justin Ho
a9d8046c49 Updated icons in settings 
Change-Id: If5eca6cf91e1c71d53694a0ce2d78485b8729737
 2011-02-03 14:49:24 -08:00
Wink Saville
5ac151ccec am ec4045fa: am 327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType 
* commit 'ec4045faba607270c4d29b5016f0156fdd6a7eb4':
  Have SecuritySettings and SoundSettings use getCurrentPhoneType
 2011-02-02 13:25:05 -08:00
Wink Saville
ec4045faba am 327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType 
* commit '327147eb062a25ecab40d66ea14559070e0ecef3':
  Have SecuritySettings and SoundSettings use getCurrentPhoneType
 2011-02-02 13:20:06 -08:00
Wink Saville
327147eb06 Have SecuritySettings and SoundSettings use getCurrentPhoneType 
To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
 2011-02-02 11:30:25 -08:00
Jaikumar Ganesh
c514edc7d4 Merge "Changes for public API of Bluetooth Discoverability." 2011-02-02 10:41:32 -08:00
Jaikumar Ganesh
d955af8461 Changes for public API of Bluetooth Discoverability. 
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the defaul - 120 secs.

Change-Id: Ife1bc803587ba975bb103a5ba7629d4a382cd705
 2011-02-01 19:58:29 -08:00
Andy Stadler
5afd91ea27 am 37033e1a: am 9597406a: Restart encryption display after screen power cycle 
* commit '37033e1a8857b125407350e64ef59b2060955d49':
  Restart encryption display after screen power cycle
 2011-02-01 18:19:42 -08:00
Andy Stadler
37033e1a88 am 9597406a: Restart encryption display after screen power cycle 
* commit '9597406aa1b83867b03a47d1a5162969b924f2fc':
  Restart encryption display after screen power cycle
 2011-02-01 18:17:19 -08:00
Andy Stadler
9597406aa1 Restart encryption display after screen power cycle 
Bug: 3414241
Change-Id: I881fc14c3e0850089b98fcbdbd86c39dde22771c
 2011-02-01 17:35:20 -08:00
Andy Stadler
fe9535517c am 5152fb05: am 95ef5575: Prevent NPE in onActivityResult 
* commit '5152fb05d1ac85e51fb88ee3fff2134376214fa2':
  Prevent NPE in onActivityResult
 2011-02-01 17:29:53 -08:00
Andy Stadler
5152fb05d1 am 95ef5575: Prevent NPE in onActivityResult 
* commit '95ef5575a2b70d8c018f99b218353c925a70d418':
  Prevent NPE in onActivityResult
 2011-02-01 17:27:26 -08:00
Jaikumar Ganesh
523cf81e18 Merge "Allow users to change the length of Bluetooth discoverability to be two minues, five minutes, an hour, or forever discoverable." 2011-02-01 16:26:54 -08:00
Chris Wren
1b0489cb3e Allow users to change the length of Bluetooth discoverability to 
be two minues, five minutes, an hour, or forever discoverable.

This addresses the internal bug 2413429:
	http://b/issue?id=2413429
and external issue 6348:
	http://code.google.com/p/android/issues/detail?id=6348

Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>

Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
 2011-02-01 16:25:44 -08:00
Andy Stadler
95ef5575a2 Prevent NPE in onActivityResult 
We're returning here in an unexpected condition;  Treat all inputs
as suspect and verify before proceeding.

Bug: 3399579
Change-Id: I389bd0528f8bc721afb5a9c4646a2e23fde77f77
 2011-02-01 16:22:41 -08:00
Andy Stadler
c9c8178bbb am 9d06aac2: am 1499740c: Preserve wakelock through rotation 
* commit '9d06aac2c0b24ef704f5fa794e5d802a5f478db5':
  Preserve wakelock through rotation
 2011-02-01 16:21:24 -08:00
Andy Stadler
9d06aac2c0 am 1499740c: Preserve wakelock through rotation 
* commit '1499740c13af5fbd5766a87825c3e789b37bab24':
  Preserve wakelock through rotation
 2011-02-01 16:17:51 -08:00
Andy Stadler
1499740c13 Preserve wakelock through rotation 
Bug: 3381450

Change-Id: Iea09d050231dfe31848666bdb186a5531d90e7bc
 2011-02-01 15:34:59 -08:00
Amith Yamasani
6700e4c811 am 7247e1a1: am 71863f3b: Merge "Use a custom media file for media volume sample." into honeycomb 
* commit '7247e1a10f4878a10fb6667b14be0dae0113dbb3':
  Use a custom media file for media volume sample.
 2011-02-01 13:26:14 -08:00
Daisuke Miyakawa
d18f0b8616 am d4eb7c6b: am 649b9f19: Disable left pane of "Input languages" conditionally. 
* commit 'd4eb7c6be375d69a9f3b4a2196826a7941137b14':
  Disable left pane of "Input languages" conditionally.
 2011-02-01 13:25:21 -08:00
Andy Stadler
f741743c28 am b3d50cac: am 13d62049: More CryptKeeper UI work. 
* commit 'b3d50cac649c101d1932825749ef686189c6b4f8':
  More CryptKeeper UI work.
 2011-02-01 13:24:38 -08:00
Daisuke Miyakawa
fe7d04fee2 Introduce "add network" again 
The button was once disabled due to the issue 3400715.
See also Ic618078bc70a7db35ec22e6382b9486e92630120

Bug: 3403168
Change-Id: If823a0e8218480b89405e5c4fa6d1afe791eb6d5
 2011-02-01 12:46:33 -08:00
Amith Yamasani
7247e1a10f am 71863f3b: Merge "Use a custom media file for media volume sample." into honeycomb 
* commit '71863f3b48588cbbcae93bc784ebefbeec47c25f':
  Use a custom media file for media volume sample.
 2011-02-01 05:31:04 -08:00
Amith Yamasani
71863f3b48 Merge "Use a custom media file for media volume sample." into honeycomb 2011-02-01 05:28:41 -08:00
Daisuke Miyakawa
d4eb7c6be3 am 649b9f19: Disable left pane of "Input languages" conditionally. 
* commit '649b9f19e1193547f339239afa32d569f43358fc':
  Disable left pane of "Input languages" conditionally.
 2011-01-31 22:49:16 -08:00
Daisuke Miyakawa
649b9f19e1 Disable left pane of "Input languages" conditionally. 
The screen is available from LatinIME's setting button, in which
we don't want the left pane, while we want the left pane when
launched as part of Settings app.

Bug: 3383738
Change-Id: I62e901e7cc14053742ae35829d82c20e432a358f
 2011-01-31 22:12:01 -08:00
Amith Yamasani
424953d55b Use a custom media file for media volume sample. 
Bug: 3409194

Intercept volume hard keys and ignore them if not voice capable.

Change-Id: Ieb620f1cfff675ab5a6a8ee69a7dd42355d2932e
 2011-01-31 21:20:22 -08:00
Eric Fischer
c712c898fb am ba275d29: (-s ours) am ba681faf: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 
* commit 'ba275d29eaf777f85f18a96e3a6dc0b6fe1c4016':
  Import revised translations.  DO NOT MERGE.  Bug 3394542
 2011-01-31 20:39:12 -08:00
Andy Stadler
b3d50cac64 am 13d62049: More CryptKeeper UI work. 
* commit '13d62049f7c96c47356f23eaee7f0997612fdf9f':
  More CryptKeeper UI work.
 2011-01-31 20:01:16 -08:00
Andy Stadler
13d62049f7 More CryptKeeper UI work. 
* Implemented failure case.
* More pixel perfect
* Remove the animation
* Display the encroid on the blank screen
* Remove the back button.
* Fix portrait mode screens

Bug: 3384231
Bug: 3394103
Bug: 3388721
Bug: 3381450
Bug: 3406278
Bug: 3351832
Change-Id: Ib763c8b577198deb45255acc767bc6d5409efc0c
 2011-01-31 19:21:37 -08:00
Eric Fischer
ba275d29ea am ba681faf: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 
* commit 'ba681faf73906dcc9c372008855667437b034cc4':
  Import revised translations.  DO NOT MERGE.  Bug 3394542
 2011-01-31 18:33:54 -08:00
Eric Fischer
6cd8c5af46 am 4975590f: (-s ours) am 2b78f433: (-s ours) am 93580e22: Import revised translations. DO NOT MERGE 
* commit '4975590f320e3739ae4970b9c72d37e32fef63b2':
  Import revised translations. DO NOT MERGE
 2011-01-31 18:15:09 -08:00
Eric Fischer
4975590f32 am 2b78f433: (-s ours) am 93580e22: Import revised translations. DO NOT MERGE 
* commit '2b78f43322970a9a8bfc215be1ee3656940f1fcd':
  Import revised translations. DO NOT MERGE
 2011-01-31 17:48:48 -08:00
Eric Fischer
ba681faf73 Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 2011-01-31 17:28:26 -08:00
Eric Fischer
2b78f43322 am 93580e22: Import revised translations. DO NOT MERGE 
* commit '93580e222c156e06b348d228bec24d83836af1f2':
  Import revised translations. DO NOT MERGE
 2011-01-31 16:15:26 -08:00
Amith Yamasani
ad39c70c2c am 015bf7ae: am a27868d9: Merge "Fix crash after adding a word to the user dictionary." into honeycomb 
* commit '015bf7ae34d9ef48cc6243c638ba51e598386d80':
  Fix crash after adding a word to the user dictionary.
 2011-01-31 15:46:43 -08:00
Amith Yamasani
015bf7ae34 am a27868d9: Merge "Fix crash after adding a word to the user dictionary." into honeycomb 
* commit 'a27868d9bd2953a9c82deb09edddf8192ddc07f9':
  Fix crash after adding a word to the user dictionary.
 2011-01-31 15:22:59 -08:00
Amith Yamasani
a27868d9bd Merge "Fix crash after adding a word to the user dictionary." into honeycomb 2011-01-31 15:20:30 -08:00
Daisuke Miyakawa
8e7aff2c41 am 6a452ce1: am 8ad1fb63: Merge "Disable back button on SetupWizard flow." into honeycomb 
* commit '6a452ce148f45cd0c8ac924803a29bb4a92bedbd':
  Disable back button on SetupWizard flow.
 2011-01-31 13:56:04 -08:00
Eric Fischer
c16a1641f9 Import revised translations. DO NOT MERGE. Bug 3394542 
Change-Id: Id6c2e64725cb9177263d9b9249125378fe04b29a
 2011-01-31 12:48:02 -08:00
Amith Yamasani
8875edede1 Fix crash after adding a word to the user dictionary. 
Bug: 3407951

Make sure that the parent fragment is a SettingsPreferenceFragment. Otherwise it's not
necessary to manage the mDialogFragment.

Change-Id: I331a3507fe11a7331ff24ecf64fe8c8c3f613636
 2011-01-31 12:46:57 -08:00