PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,707 Commits 1 Branch 0 Tags
6a01acdeaf24e94a8f6a1399e8a6d351da26c07c
Commit Graph

3707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Fischer
74e312f5ae am f3ee2680: (-s ours) am 0cd5e21a: (-s ours) am 95112e5b: Import revised translations. DO NOT MERGE 
* commit 'f3ee2680bc6a8dfd8b1cf09e2306fdc74476bd21':
  Import revised translations.  DO NOT MERGE
 2011-01-29 08:35:39 -08:00
Eric Fischer
f3ee2680bc am 0cd5e21a: (-s ours) am 95112e5b: Import revised translations. DO NOT MERGE 
* commit '0cd5e21a40fce62738792a45608a9b9391f62d2b':
  Import revised translations.  DO NOT MERGE
 2011-01-29 08:02:39 -08:00
Hung-ying Tyan
9bb922dd58 am 2188a5e7: am 27682b0a: Merge "Clear mDialogFragment when it\'s detached" into honeycomb 
* commit '2188a5e7e5e8c070e0cc6913e0ded0d35288fbb8':
  Clear mDialogFragment when it's detached
 2011-01-29 02:33:57 -08:00
Hung-ying Tyan
2188a5e7e5 am 27682b0a: Merge "Clear mDialogFragment when it\'s detached" into honeycomb 
* commit '27682b0aff076e9d4ef6c4651effc9ce47ff6fb6':
  Clear mDialogFragment when it's detached
 2011-01-29 02:31:34 -08:00
Hung-ying Tyan
27682b0aff Merge "Clear mDialogFragment when it's detached" into honeycomb 2011-01-29 02:29:15 -08:00
Vasu Nori
f3e7f5097d am 1acf3d16: am a0098bd3: Merge "bug:3402846 fix settings->storage" into honeycomb 
* commit '1acf3d16298ac6a9c807db71d1a0f8908b9bed3d':
  bug:3402846 fix settings->storage
 2011-01-28 18:45:12 -08:00
Vasu Nori
1acf3d1629 am a0098bd3: Merge "bug:3402846 fix settings->storage" into honeycomb 
* commit 'a0098bd34602acdf129ded0152ffeb07bb64d28d':
  bug:3402846 fix settings->storage
 2011-01-28 18:42:50 -08:00
Vasu Nori
a0098bd346 Merge "bug:3402846 fix settings->storage" into honeycomb 2011-01-28 18:39:38 -08:00
Irfan Sheriff
785961e574 am c3bc1104: am 7bdf0e73: Move sleep policy to main settings page 
* commit 'c3bc1104666ca4b54b849a5642ce7bc963a8e065':
  Move sleep policy to main settings page
 2011-01-28 17:32:45 -08:00
Irfan Sheriff
c3bc110466 am 7bdf0e73: Move sleep policy to main settings page 
* commit '7bdf0e73d051f176fbc20451761eb50177d69f91':
  Move sleep policy to main settings page
 2011-01-28 17:30:59 -08:00
Vasu Nori
a3314e2bdb bug:3402846 fix settings->storage 
Change-Id: Icb9e33cb0336f87f43797330f56e9c8fcbe2dfd0
 2011-01-28 17:14:38 -08:00
Irfan Sheriff
7bdf0e73d0 Move sleep policy to main settings page 
Bug: 3404049
Change-Id: I091abd737894a4adb9ebfc08b8e63bc3224b971c
 2011-01-28 17:00:37 -08:00
Daisuke Miyakawa
22e57a880f am e4df0b3e: am 46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb 
* commit 'e4df0b3ec87ddcb6d480ffff5c954d9eee7bef74':
  Enlarge texts and fit the other elements
 2011-01-28 16:28:57 -08:00
Daisuke Miyakawa
e4df0b3ec8 am 46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb 
* commit '46f4b754e1173cfc7065df39311ab5c30f92ed60':
  Enlarge texts and fit the other elements
 2011-01-28 16:26:08 -08:00
Daisuke Miyakawa
46f4b754e1 Merge "Enlarge texts and fit the other elements" into honeycomb 2011-01-28 16:23:45 -08:00
Eric Fischer
096b3bc894 am 72badf79: (-s ours) am 335387da: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '72badf79b4e86b6815e81d0e0dc2140799691fcf':
  Import revised translations.  DO NOT MERGE
 2011-01-28 15:18:20 -08:00
Eric Fischer
72badf79b4 am 335387da: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '335387dafe912d3487ef93aa3250ca3059bdfd48':
  Import revised translations.  DO NOT MERGE
 2011-01-28 15:14:04 -08:00
Eric Fischer
335387dafe Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-28 15:10:11 -08:00
Eric Fischer
2eb1edc446 Import revised translations. DO NOT MERGE 
Change-Id: Ifb50963e88a2d7c48440f0be4b411ede41ec0998
 2011-01-28 14:58:24 -08:00
Jake Hamby
12f608479f am e3b22331: am e1f883a3: Merge "Don\'t display extra A2DP profile icon for OPP." into honeycomb 
* commit 'e3b223310787a3603dce40c776e55e4a911c6025':
  Don't display extra A2DP profile icon for OPP.
 2011-01-28 14:25:37 -08:00
Jake Hamby
e3b2233107 am e1f883a3: Merge "Don\'t display extra A2DP profile icon for OPP." into honeycomb 
* commit 'e1f883a38c13ebb8ac7a66172f30b3b01b4577c0':
  Don't display extra A2DP profile icon for OPP.
 2011-01-28 14:23:13 -08:00