PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,828 Commits 1 Branch 0 Tags
783be0a24f328d7e781b5765b7688c55fb24c89c
Commit Graph

3828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Fischer
93580e222c Import revised translations. DO NOT MERGE 
Change-Id: I7189d018da1a65d6e37b16353b1133b6a51d0df1
 2011-01-31 12:25:49 -08:00
Daisuke Miyakawa
6a452ce148 am 8ad1fb63: Merge "Disable back button on SetupWizard flow." into honeycomb 
* commit '8ad1fb63403e624f730684db4a3b0ea8aec80b78':
  Disable back button on SetupWizard flow.
 2011-01-31 11:59:36 -08:00
Daisuke Miyakawa
8ad1fb6340 Merge "Disable back button on SetupWizard flow." into honeycomb 2011-01-31 11:55:43 -08:00
Andy Stadler
69ba9331ad am 865ca2a2: am 17141200: Final cleanup of "password required" dialog 
* commit '865ca2a2efb4ebec3b6ddc89401f8544515cd43a':
  Final cleanup of "password required" dialog
 2011-01-31 11:05:50 -08:00
Daisuke Miyakawa
62fb701ea9 Disable back button on SetupWizard flow. 
Bug: 3383738
Change-Id: Ie06d85ee22482f865a8173a45d0645699427729e
 2011-01-31 11:05:05 -08:00
Andy Stadler
865ca2a2ef am 17141200: Final cleanup of "password required" dialog 
* commit '171412000a95ce35fd3461afe7bcc5b7f2f210f4':
  Final cleanup of "password required" dialog
 2011-01-31 11:03:45 -08:00
Andy Stadler
171412000a Final cleanup of "password required" dialog 
Bug: 3406068
Change-Id: I65c0e8f37236194565cb3a1cf022dfdfdc5c0044
 2011-01-31 10:15:53 -08:00
Justin Ho
5fab237226 am 89ebb843: am 88866927: Merge "Updating Settings icons in side menu Bug: 3362749" into honeycomb 
* commit '89ebb843be7a8c509cb0efbb5bf2812bb2dcb97f':
  Updating Settings icons in side menu Bug: 3362749
 2011-01-30 20:13:07 -08:00
Justin Ho
89ebb843be am 88866927: Merge "Updating Settings icons in side menu Bug: 3362749" into honeycomb 
* commit '888669277e2b6220162fe25e368a9cc9c208e501':
  Updating Settings icons in side menu Bug: 3362749
 2011-01-30 20:10:23 -08:00
Justin Ho
888669277e Merge "Updating Settings icons in side menu Bug: 3362749" into honeycomb 2011-01-30 20:07:42 -08:00
Justin Ho
2019c8db03 Updating Settings icons in side menu 
Bug: 3362749

Change-Id: I95c2d4a69e05fe5af3b89f4f3ee9e635403b5015
 2011-01-30 20:04:46 -08:00
Andy Stadler
a946934cc3 am d19b76f6: am f534db8a: Merge "Improvements to enable encryption steps" into honeycomb 
* commit 'd19b76f6062665ce8e0f80276ee3076262f7c4b0':
  Improvements to enable encryption steps
 2011-01-30 17:30:13 -08:00
Andy Stadler
d19b76f606 am f534db8a: Merge "Improvements to enable encryption steps" into honeycomb 
* commit 'f534db8ae4d62b39e5afecb2242c06dadf070e99':
  Improvements to enable encryption steps
 2011-01-30 17:12:38 -08:00
Andy Stadler
f534db8ae4 Merge "Improvements to enable encryption steps" into honeycomb 2011-01-30 17:09:11 -08:00
Roy West
8bb35b1393 am 15dfde32: am 66f32a86: Fix bug 3405977. 
* commit '15dfde321a43586fb1f5a0a60737c434435b0745':
  Fix bug 3405977.
 2011-01-30 16:48:10 -08:00
Roy West
15dfde321a am 66f32a86: Fix bug 3405977. 
* commit '66f32a8680eca2d3203b31bd36efdf753ad1a7fc':
  Fix bug 3405977.
 2011-01-30 16:45:33 -08:00
Roy West
66f32a8680 Fix bug 3405977. 
Change-Id: I85c285a1dc07ba6e87ba9103c01a79c50d23bf60
 2011-01-30 16:40:55 -08:00
Andy Stadler
8dbcb888ec Improvements to enable encryption steps 
* Don't crash when user has pattern lock
* Updated text for final confirmation screen
* Show power & battery level warning text
* Updated layout for both confirmation screens (cleaned up margins,
  removed hardcoded text sizes, made settings & confirm consistent).
* Added comments for translators to all cryptkeeper strings

Bug: 3383190
Bug: 3383292
Bug: 3405707
Change-Id: I1adcdd963a549eb6541662ff941d245db5563710
 2011-01-30 16:25:38 -08:00
The Android Open Source Project
65a105b962 am 666fbc3b: Reconcile gingerbread-plus-aosp and honeycomb 
* commit '666fbc3b39aabfb2ff5cfe54acb33f07572f17dd':
 2011-01-30 12:55:37 -08:00
The Android Open Source Project
666fbc3b39 Reconcile gingerbread-plus-aosp and honeycomb 
Change-Id: I8f09b42bc0bccc5e1455e6d9372a0488394de35c
 2011-01-30 12:42:26 -08:00
The Android Open Source Project
51985c04dd Mass merge from gingerbread - do not merge 
Change-Id: I2693f4f400c0c56df04ccb571bfd3420c6f0d697
 2011-01-30 12:42:26 -08:00
Justin Ho
8a3f211b1c am 9685108e: am 6db0f05a: Deprecating old Settings icon completely Updating to new Settings launcher icon Bug: 3362749 
* commit '9685108ea050577d099e0c02ffb223b8cff3b7df':
  Deprecating old Settings icon completely Updating to new Settings launcher icon Bug: 3362749
 2011-01-29 14:34:12 -08:00
Justin Ho
9685108ea0 am 6db0f05a: Deprecating old Settings icon completely Updating to new Settings launcher icon Bug: 3362749 
* commit '6db0f05a8df1e8d1d6d4cd7601caad8b5ec8bd75':
  Deprecating old Settings icon completely Updating to new Settings launcher icon Bug: 3362749
 2011-01-29 14:32:34 -08:00
Justin Ho
6db0f05a8d Deprecating old Settings icon completely 
Updating to new Settings launcher icon
Bug: 3362749

Change-Id: I4d33650b68aac3aa9ddd56d2acab614f80266840
 2011-01-29 13:19:05 -08:00
Daisuke Miyakawa
3fb48a588a am bb627e40: am a93196f1: Take care of null in Wifi setup. 
* commit 'bb627e40cf7c174eb701eca8825e087355ba5eee':
  Take care of null in Wifi setup.
 2011-01-29 12:06:31 -08:00
Daisuke Miyakawa
bb627e40cf am a93196f1: Take care of null in Wifi setup. 
* commit 'a93196f1651a0598d6e398f6fb3c2e513a3b7091':
  Take care of null in Wifi setup.
 2011-01-29 12:04:06 -08:00
Daisuke Miyakawa
a93196f165 Take care of null in Wifi setup. 
The preference isn't available in Wifi setup launched from
SetupWizard, causing NPE.

Bug: 3404998
Change-Id: Ia0dabea95e5e7424698a269c0851d610fd305309
 2011-01-29 11:55:24 -08:00
Eric Fischer
29c03671f2 am 5a2bb8c0: (-s ours) Import revised translations. DO NOT MERGE 
* commit '5a2bb8c0dc33837696f80d6690d51f031d7884c8':
  Import revised translations.  DO NOT MERGE
 2011-01-29 11:25:03 -08:00
Eric Fischer
22b0e7aa8b am 95112e5b: (-s ours) Import revised translations. DO NOT MERGE 
* commit '95112e5b9810b6a70974ace6ee1c017b57e466af':
  Import revised translations.  DO NOT MERGE
 2011-01-29 10:47:04 -08:00
Irfan Sheriff
2310ebc22a am 6c15162b: am abeff000: Change sleep policy strings 
* commit '6c15162b7dd22e43852b1af3a38102a07f721f1c':
  Change sleep policy strings
 2011-01-29 10:17:12 -08:00
Irfan Sheriff
6c15162b7d am abeff000: Change sleep policy strings 
* commit 'abeff000fdd0c421ee514effb83c202174209b9d':
  Change sleep policy strings
 2011-01-29 10:14:45 -08:00
Eric Fischer
313c41fb35 am 8c152471: (-s ours) am abdfaed8: (-s ours) am 5a2bb8c0: Import revised translations. DO NOT MERGE 
* commit '8c152471853613730429fa9104ad9ff61efa91ec':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:18:11 -08:00
Eric Fischer
8c15247185 am abdfaed8: (-s ours) am 5a2bb8c0: Import revised translations. DO NOT MERGE 
* commit 'abdfaed8f4791a5f1776a005dd58c33e595842e8':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:12:45 -08:00
Irfan Sheriff
abeff000fd Change sleep policy strings 
Bug: 3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
 2011-01-29 09:10:13 -08:00