PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,541 Commits 1 Branch 0 Tags
e44f44d67913ae74900656ee2ef1d2f690c63d1c
Commit Graph

5541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
7129322d06 Reconcile with ics-mr1-release 
Change-Id: Idbff6b6c73a4e5c68769504f39b47239df431476
 2011-11-30 12:56:18 -08:00
Daniel Sandler
1e219778ed Pulling screen savers for now. DO NOT MERGE. 
Bug: 5689684
Change-Id: Ida6f23484c91d1cde539fc4a64e467970fa1fdb3
 2011-11-30 14:32:53 -05:00
Daniel Sandler
cfd97b59f2 am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1 
* commit 'a6ff69ede0fa9868464a1a7059cad8fb3838c5ab':
  Show screen saver toggle on tablets.
 2011-11-30 10:50:54 -08:00
The Android Automerger
708342cff2 merge in ics-mr1-release history after reset to ics-mr1 2011-11-30 06:46:56 -08:00
Daniel Sandler
a6ff69ede0 Merge "Show screen saver toggle on tablets." into ics-mr1 2011-11-29 18:18:29 -08:00
Irfan Sheriff
8c2ac71b34 Add wifi direct settings UI 
- Use switch for toggling
- Follow string and UI suggestions from UX folks

The goal is to keep the interaction minimal - PBC is used when possible and keypad/display
are used only if really necessary

Bug: 5332330
Change-Id: I83e91ad3a393c143e70f1f2b6a842b95eacde404
 2011-11-29 15:43:20 -08:00
Eric Fischer
22c79cfa1b am 21b5d18b: (-s ours) Import revised translations. DO NOT MERGE 
* commit '21b5d18bcbb15ce2571aab8b60a7aca8971ef7a7':
  Import revised translations.  DO NOT MERGE
 2011-11-29 13:32:41 -08:00
Eric Fischer
21b5d18bcb Import revised translations. DO NOT MERGE 
Change-Id: Ia5368f1dffbd304e7b95d91f2a64acdc76381fa6
 2011-11-29 13:18:54 -08:00
Daniel Sandler
c949ef6e64 Show screen saver toggle on tablets. 
Bug: 5669263
Change-Id: I16ca00ff96b17cc367c4f6fa4260da5a08480ac0
 2011-11-29 16:10:41 -05:00
Eric Fischer
b5023d25d2 Import revised translations. 
Change-Id: I057d4f0cafa5d08e4048e4fd437e69a023f5edb7
 2011-11-29 11:19:18 -08:00
The Android Automerger
9192b0a7c0 merge in ics-mr1-release history after reset to ics-mr1 2011-11-28 12:23:11 -08:00
The Android Open Source Project
51adfd9c8b Reconcile with ics-mr1-release 
Change-Id: I078f0b904d665abe2050b986b952bc714a706019
 2011-11-22 13:26:28 -08:00
The Android Automerger
eaec27fd16 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:57:00 -08:00
Gilles Debunne
648f4f6688 Fixed layout for "Available Devices" in Bluetooth 
Bug 5646340.

'Title' and 'scanning' text are on the same line as a PreferenceCategory.
The first one has a 0dp width, compensated by a 1 weight.

When scanning is not displayed, it should be GONE rather than INVISIBLE
to let the title take the whole space.

When both are visible, they should split the space, or else, with long
texts in foreign languages, scanning takes the whole space, leaving the
title with an almost 0 width that generates a very high text because
of wrapping.

Distributing size among the two texts to accomodate for such cases.

Changed padding and alignment to get reasonnable results for Slovenian
language (i.e. very long text), when both title and scanning are displayed.

Strangely, the right scanning alignment is not enforced, although I checked
it is correctly set on the TextView. Not investigating further now since it
may not be desired by UX anyway.

Change-Id: I6b4c6fcbc350d3664749f58eee34ec0867720626
 2011-11-22 10:45:18 +01:00
Freeman Ng
800a0a426d am 2fa017f8: Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1 
* commit '2fa017f874d20a5b037ebe57f3fc0c53964080bc':
  fix datetime layout for phones and remove orientation locking
 2011-11-21 21:08:31 -08:00
Eric Fischer
68f6312f88 am 2e2c4990: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '2e2c49901f103c148696caffcc451bf0def90d06':
  Import revised translations. DO NOT MERGE
 2011-11-21 21:08:01 -08:00
Freeman Ng
2fa017f874 Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1 2011-11-21 16:05:45 -08:00
Eric Fischer
2e2c49901f Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:23:37 -08:00
Eric Fischer
27ae11dfd5 Import revised translations. DO NOT MERGE 
Change-Id: Ibf7154e471cba15745a917bffe4cf49f2f01aebb
 2011-11-21 15:02:49 -08:00
Freeman Ng
5a82528089 fix datetime layout for phones and remove orientation locking 
The first fixes the bug, the second was something I noticed
while debugging. We're no longer locking setup wizard orientation
for anything screen size, and so no activities it calls needs
to do that any more, either.

bug: 5642402
Change-Id: I5911223112a19841f6b4754a70148f28a753f736
 2011-11-21 14:47:02 -08:00
Daniel Sandler
9e61c175fe am 6f0ea441: Settings changes for Android Dreams (now Screen Candy). 
* commit '6f0ea441e465a0af646f8952f820a92f6902c8d9':
  Settings changes for Android Dreams (now Screen Candy).
 2011-11-19 20:46:41 -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
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
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
aa6677e943 am 0d59935d: am c90961d4: Reconcile with ics-factoryrom-2-release 
* commit '0d59935d301cc782cca03bda32f4f98e7a294b08':
 2011-11-17 04:08:35 -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
bae10f7b3b Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-16 10:51:14 -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
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
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
ceb05aca64 Merge commit '1b7268e' into kjsdkljsdfkljsdljsdf 2011-11-15 16:52: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
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
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
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
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
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
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
Amith Yamasani
c101d2d3ba Dismiss dialogs properly on closing. 
Also make the invisible activity truly invisible (was
showing a blue line behind the dialog).

Bug: 5572140
Change-Id: I67b31f0682f189c7075011e0dd0660b0fbc543d9
 2011-11-14 15:30:16 -08:00