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

6319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Eric Fischer
1b7268ef5c Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-14 15:09:10 -08:00
Jim Miller
9e2e24202d Fix 5579440: Add transport control view to tablet unlock screens 
The AM/PM indicator is no longer used in lockscreen.  This propagates
the change to the cryptkeeper.

Change-Id: Iecd99f6439b5f898443e7d5c37984f7cd7607ce5
 2011-11-14 14:08:47 -08:00
Danielle Millett
6f3b1bb1d7 DO NOT MERGE Cherry picking from MR0 cl 147215 
Adding an improve face matching settings option for Face Unlock

Adding an option which will launch a version of setup where faces
can be added to the current gallery.  It requires the user to first
confirm their password before launching addToSetup.

Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.

Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.

Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45
 2011-11-14 16:40:40 -05:00
Eric Fischer
bf0e6d138e Import revised translations. DO NOT MERGE 
Change-Id: I3c719179477fda49580dbc58f79443a4e5c25cc9
 2011-11-14 13:33:52 -08:00
Amith Yamasani
af9252849f Add compatibility aliases for shortcuts added to home screen in gingerbread. 
Bug: 5016573
Change-Id: I1898b2f51216354829acca11e73186465f25ec32
 2011-11-14 11:51:36 -08:00
The Android Automerger
0c89a0839f merge in ics-mr1-release history after reset to ics-mr1 2011-11-13 06:47:26 -08:00
Jeff Sharkey
d43f33debc am c32178b6: am 4b94e073: Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1 
* commit 'c32178b6da8277ca503a3267070731392cfb62fc':
  Data usage label width, locking, Wi-Fi fixes.
 2011-11-11 15:59:27 -08:00
Jeff Sharkey
8083eaffbe am 4b94e073: Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1 
* commit '4b94e073854b72205f12ff268211a51d634fbc8f':
  Data usage label width, locking, Wi-Fi fixes.
 2011-11-11 11:49:54 -08:00
Jeff Sharkey
c32178b6da am 4b94e073: Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1 
* commit '4b94e073854b72205f12ff268211a51d634fbc8f':
  Data usage label width, locking, Wi-Fi fixes.
 2011-11-11 15:31:17 +00:00
Jeff Sharkey
4b94e07385 Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1 2011-11-10 18:10:34 -08:00
Jeff Sharkey
bdf98e84ab Data usage label width, locking, Wi-Fi fixes. 
Avoid wrapping sweep labels when underlying string is long, and avoid
showing blank "^1" sweep labels.  Only offer "restrict data" when
mobile networks are present.  Add locking around UidDetailProvider.

Move to isNetworkSupported() for consistency.

Bug: 5492495, 5471602, 5439402, 5373465
Change-Id: I79f5938d45ffbb4c2c242106424a466042a26c1c
 2011-11-10 17:17:24 -08:00
Eric Fischer
c5eccfd8d2 am 98a798eb: Merge "Import revised translations." 
* commit '98a798ebd8004a1ff69f9da3b25dcd4991e5a078':
  Import revised translations.
 2011-11-10 23:06:20 +00:00