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

6432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
edcad7bcbb am 6f0ea441: Settings changes for Android Dreams (now Screen Candy). 
* commit '6f0ea441e465a0af646f8952f820a92f6902c8d9':
  Settings changes for Android Dreams (now Screen Candy).
 2011-11-19 20:44:34 -08:00
The Android Open Source Project
c33374cfc1 am 42845618: Reconcile with ics-mr1-release 
* commit '428456184d90956315abcba69bf0cd50065fb8b9':
 2011-11-18 15:46:35 -08:00
The Android Open Source Project
428456184d Reconcile with ics-mr1-release 
Change-Id: I9295aacf40f2ad4c8a2bd6fff1a5366b0519448c
 2011-11-18 15:43:40 -08:00
Daniel Sandler
6f0ea441e4 Settings changes for Android Dreams (now Screen Candy). 
- new preference design
- remove candy-specific timeout
- use new settings keys

Requires Change I31f31b3

Bug: 5591015
Change-Id: I45cb6ea5c68f9932c6d4e65e2b219331d48a62d6
 2011-11-17 21:06:29 -08:00
Daniel Sandler
4de08b4495 am af7de91c: am cee089b1: Merge "Show desk dock apps as screen savers." into ics-mr1 
* commit 'af7de91c0c24dc553b5121748ed2c91e89d8aff8':
  Show desk dock apps as screen savers.
 2011-11-17 11:48:58 -08:00
Daniel Sandler
af7de91c0c am cee089b1: Merge "Show desk dock apps as screen savers." into ics-mr1 
* commit 'cee089b1526e27b9b96dbeb9549199b0f8a78c9b':
  Show desk dock apps as screen savers.
 2011-11-17 11:46:24 -08:00
The Android Automerger
61aba049ac merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:47:21 -08:00
Eric Fischer
4a6e5390ef am 122040e1: am bae10f7b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '122040e19ddb476d0f634cd80eb1bb0bfff7da2f':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:50:55 -08:00
Freeman Ng
281ff4a4ff am c303ade1: am fd2daf6a: Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1 
* commit 'c303ade15b6bde5e5ed3e3da03fb0b8616261dc3':
  fix npe when launching datetime settings for phone setup wizard
 2011-11-17 05:50:55 -08:00
Eric Fischer
122040e19d am bae10f7b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'bae10f7b3b5f3e5e860e5f0ca91f045a41a023c3':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:45:39 -08:00
Freeman Ng
c303ade15b am fd2daf6a: Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1 
* commit 'fd2daf6a716006ba0b0243c523e440999610076a':
  fix npe when launching datetime settings for phone setup wizard
 2011-11-17 05:45:36 -08:00
The Android Open Source Project
21699e221d am aa6677e9: am 0d59935d: am c90961d4: Reconcile with ics-factoryrom-2-release 
* commit 'aa6677e9435c55dd8b7ab7996c5a0c77058d4b83':
 2011-11-17 04:12:56 -08:00
The Android Open Source Project
aa6677e943 am 0d59935d: am c90961d4: Reconcile with ics-factoryrom-2-release 
* commit '0d59935d301cc782cca03bda32f4f98e7a294b08':
 2011-11-17 04:08:35 -08:00
Daniel Sandler
19ce4dc554 am cee089b1: Merge "Show desk dock apps as screen savers." into ics-mr1 
* commit 'cee089b1526e27b9b96dbeb9549199b0f8a78c9b':
  Show desk dock apps as screen savers.
 2011-11-16 22:38:00 -08:00
Daniel Sandler
cee089b152 Merge "Show desk dock apps as screen savers." into ics-mr1 2011-11-16 22:36:06 -08:00
Daniel Sandler
f630808093 Show desk dock apps as screen savers. 
Now that docking launches the screen saver instead of a dock
app, we offer those apps as screen savers to allow them to
continue functioning as they did before. As a bonus, users
without docks can now use dock apps!

Bug: 5591015
Change-Id: Ifc138ab4c0bdffa1bbd7afe8b3ad730ec971aa34
 2011-11-16 22:28:14 -08:00
Eric Fischer
c6936b0b67 am bae10f7b: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'bae10f7b3b5f3e5e860e5f0ca91f045a41a023c3':
  Import revised translations.  DO NOT MERGE
 2011-11-16 10:53:33 -08:00
Eric Fischer
bae10f7b3b Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-16 10:51:14 -08:00
Freeman Ng
2660c67f59 am fd2daf6a: Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1 
* commit 'fd2daf6a716006ba0b0243c523e440999610076a':
  fix npe when launching datetime settings for phone setup wizard
 2011-11-16 10:46:34 -08:00
Freeman Ng
fd2daf6a71 Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1 2011-11-16 10:44:46 -08:00
Eric Fischer
fa741185df Import revised translations. DO NOT MERGE 
Change-Id: I1f162a86ad9c165c72d5b3086a4c7a66aa9435f9
 2011-11-16 10:29:48 -08:00
The Android Open Source Project
4ed130080f am 0d59935d: am c90961d4: Reconcile with ics-factoryrom-2-release 
* commit '0d59935d301cc782cca03bda32f4f98e7a294b08':
 2011-11-16 09:39:38 -08:00
The Android Open Source Project
0d59935d30 am c90961d4: Reconcile with ics-factoryrom-2-release 
* commit 'c90961d43102563b540d719e637905570f9856e4':
 2011-11-16 09:36:10 -08:00
The Android Open Source Project
c90961d431 Reconcile with ics-factoryrom-2-release 
Change-Id: Ie2cc2f5f8339562f612278346ebd1d0aae763607
 2011-11-16 08:56:44 -08:00
The Android Automerger
a498cb4d12 merge in ics-mr1-release history after reset to ics-mr1 2011-11-16 06:47:01 -08:00
Eric Fischer
61fd4ff533 am 655322b7: am ceb05aca: Merge commit \'1b7268e\' into kjsdkljsdfkljsdljsdf 
* commit '655322b76a4e436783862a8a08cc712c8dc5dc48':
  Import revised translations. DO NOT MERGE
 2011-11-15 18:29:30 -08:00
Eric Fischer
655322b76a am ceb05aca: Merge commit \'1b7268e\' into kjsdkljsdfkljsdljsdf 
* commit 'ceb05aca64adde816c3611f44242c77753ecf9f6':
  Import revised translations. DO NOT MERGE
 2011-11-15 18:25:19 -08:00
Freeman Ng
fd2945f3b1 fix npe when launching datetime settings for phone setup wizard 
also slightly "modernized" the UI while I was in there by removing
the button bar and button icon

bug: 5517928
Change-Id: I502d56780d7c3bd474fc5120a0b306def3c04dd4
 2011-11-15 17:15:55 -08:00
Eric Fischer
9edc02b54e am ceb05aca: Merge commit \'1b7268e\' into kjsdkljsdfkljsdljsdf 
* commit 'ceb05aca64adde816c3611f44242c77753ecf9f6':
  Import revised translations. DO NOT MERGE
 2011-11-15 16:55:32 -08:00
Eric Fischer
ceb05aca64 Merge commit '1b7268e' into kjsdkljsdfkljsdljsdf 2011-11-15 16:52:30 -08:00
Amith Yamasani
4c49599ff6 am 7b43eab9: am b08c1102: Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1 
* commit '7b43eab98b5a6f8baece86b2b24d87308be38113':
  Kill the Switch on top-right after exiting Accounts & sync.
 2011-11-15 13:30:30 -08:00
Amith Yamasani
7b43eab98b am b08c1102: Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1 
* commit 'b08c11028776bab44e2b919edc3a7bbc8f9308e6':
  Kill the Switch on top-right after exiting Accounts & sync.
 2011-11-15 13:29:01 -08:00
Amith Yamasani
ff762975c5 am b08c1102: Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1 
* commit 'b08c11028776bab44e2b919edc3a7bbc8f9308e6':
  Kill the Switch on top-right after exiting Accounts & sync.
 2011-11-15 13:27:43 -08:00
Amith Yamasani
b08c110287 Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1 2011-11-15 13:25:25 -08:00
Danielle Millett
74f73bd0f3 am 0b49c342: am 11c2641c: (-s ours) am 6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215 
* commit '0b49c3426a1b08f2de1f35562614630bef32cc4c':
  DO NOT MERGE Cherry picking from MR0 cl 147215
 2011-11-15 13:16:45 -08:00
Danielle Millett
0b49c3426a am 11c2641c: (-s ours) am 6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215 
* commit '11c2641cebe18a9baf1c084bfdd778e51db3ae93':
  DO NOT MERGE Cherry picking from MR0 cl 147215
 2011-11-15 13:11:07 -08:00
Amith Yamasani
cd5f82c1aa am d2b1a76c: am cd76b687: Merge "Dismiss dialogs properly on closing." into ics-mr1 
* commit 'd2b1a76c66a04d320cf908d28d2d680341452e72':
  Dismiss dialogs properly on closing.
 2011-11-15 13:10:32 -08:00
Amith Yamasani
d2b1a76c66 am cd76b687: Merge "Dismiss dialogs properly on closing." into ics-mr1 
* commit 'cd76b687ad4945c9e3bec5231144354a15d498f7':
  Dismiss dialogs properly on closing.
 2011-11-15 13:07:16 -08:00
Amith Yamasani
6b7cf25776 Kill the Switch on top-right after exiting Accounts & sync. 
Bug: 5564377  - Bluetooth screen showing a Switch that doesn't follow
the bluetooth setting.

This seems to have been the Switch in Accounts & sync being set as a
custom view for the Settings activity and not removed on changing
fragments.

Change-Id: I4575a769fbf5482048dbc4e912c6b6f782f505a0
 2011-11-15 12:43:59 -08:00
Danielle Millett
25d61662ec am 11c2641c: am 6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215 
* commit '11c2641cebe18a9baf1c084bfdd778e51db3ae93':
  DO NOT MERGE Cherry picking from MR0 cl 147215
 2011-11-15 12:20:46 -08:00
Danielle Millett
11c2641ceb am 6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215 
* commit '6f3b1bb1d73e9b321144bec7faeaceb9d7c5caf8':
  DO NOT MERGE Cherry picking from MR0 cl 147215
 2011-11-15 12:16:57 -08:00
Amith Yamasani
bd025bf04d am cd76b687: Merge "Dismiss dialogs properly on closing." into ics-mr1 
* commit 'cd76b687ad4945c9e3bec5231144354a15d498f7':
  Dismiss dialogs properly on closing.
 2011-11-15 10:14:28 -08:00
Amith Yamasani
cd76b687ad Merge "Dismiss dialogs properly on closing." into ics-mr1 2011-11-15 10:12:32 -08:00
The Android Automerger
2ee7a7be0c merge in ics-mr1-release history after reset to ics-mr1 2011-11-15 06:46:41 -08:00
Jim Miller
b525a9b419 am 054c7634: am 9e2e2420: Fix 5579440: Add transport control view to tablet unlock screens 
* commit '054c763406b71c2446e4ddcd7e72489f919e40d3':
  Fix 5579440: Add transport control view to tablet unlock screens
 2011-11-15 04:11:50 -08:00
Amith Yamasani
32e9722938 am 34591588: am af925284: Add compatibility aliases for shortcuts added to home screen in gingerbread. 
* commit '34591588258cd133ba1f266e1dab8139baa6157d':
  Add compatibility aliases for shortcuts added to home screen in gingerbread.
 2011-11-15 04:11:50 -08:00
Jim Miller
054c763406 am 9e2e2420: Fix 5579440: Add transport control view to tablet unlock screens 
* commit '9e2e24202d3405175f086419477d208264dfd580':
  Fix 5579440: Add transport control view to tablet unlock screens
 2011-11-14 16:18:42 -08:00
Amith Yamasani
3459158825 am af925284: Add compatibility aliases for shortcuts added to home screen in gingerbread. 
* commit 'af9252849fd94c1f2859c56a4010900ea38a607e':
  Add compatibility aliases for shortcuts added to home screen in gingerbread.
 2011-11-14 16:18:40 -08:00
Jim Miller
1292602cd5 am 9e2e2420: Fix 5579440: Add transport control view to tablet unlock screens 
* commit '9e2e24202d3405175f086419477d208264dfd580':
  Fix 5579440: Add transport control view to tablet unlock screens
 2011-11-14 16:16:39 -08:00
Amith Yamasani
d7cf2cc44e am af925284: Add compatibility aliases for shortcuts added to home screen in gingerbread. 
* commit 'af9252849fd94c1f2859c56a4010900ea38a607e':
  Add compatibility aliases for shortcuts added to home screen in gingerbread.
 2011-11-14 16:16:39 -08:00