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

5780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Eric Fischer
98a798ebd8 Merge "Import revised translations." 2011-11-10 15:03:08 -08:00
The Android Open Source Project
d876ce1997 am 753259c5: Reconcile with ics-mr1-release 
* commit '753259c5bdf922553c22de0ca0d3371073690271':
 2011-11-10 22:38:56 +00:00
The Android Open Source Project
753259c5bd Reconcile with ics-mr1-release 
Change-Id: Id4cfdbf63e6f69740330f68028c82c03d4167aca
 2011-11-10 14:36:34 -08:00
Eric Fischer
1509fa6f31 Import revised translations. 
Change-Id: I21ac7772ba81ac0fb36cf2b82af5eb0bc43292a5
 2011-11-10 14:22:55 -08:00
Amith Yamasani
5d8d1ef1ef am 445e6a15: am 6519c610: Merge "Potential fix for monkey crash." into ics-mr1 
* commit '445e6a15e8432cafbd250022724b1188382f8f9e':
  Potential fix for monkey crash.
 2011-11-10 21:15:02 +00:00
Amith Yamasani
445e6a15e8 am 6519c610: Merge "Potential fix for monkey crash." into ics-mr1 
* commit '6519c610353cdb9ed670913058a1732cf79d6186':
  Potential fix for monkey crash.
 2011-11-10 21:13:08 +00:00
Amith Yamasani
6519c61035 Merge "Potential fix for monkey crash." into ics-mr1 2011-11-10 13:09:54 -08:00
Robert Greenwalt
18c01186ae am 19b22190: Merge "Add system prop to work around tether provisioning" 
* commit '19b22190c5e9d24a500749f800262f13207030fe':
  Add system prop to work around tether provisioning
 2011-11-10 18:04:33 +00:00
Robert Greenwalt
19b22190c5 Merge "Add system prop to work around tether provisioning" 2011-11-10 10:02:40 -08:00
Eric Fischer
2d421f45e6 am 802892a6: am ffc1214c: (-s ours) am de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE 
* commit '802892a61397cd062cc658e6033defc75a4cca59':
  Import revised translations.  DO NOT MERGE
 2011-11-10 16:20:35 +00:00
Eric Fischer
802892a613 am ffc1214c: (-s ours) am de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'ffc1214ccbd04655a435573f36d550c5c66d78de':
  Import revised translations.  DO NOT MERGE
 2011-11-10 16:15:03 +00:00
Robert Greenwalt
505766cd60 Add system prop to work around tether provisioning 
Set net.tethering.noprovisioning to something non-empty to avoid the provisioning check.

bug:5445277
Change-Id: I048bffe2c11d80d79e8065f7fbe6cfb6db87da85
 2011-11-09 17:06:41 -08:00
Eric Fischer
ffc1214ccb am de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'de8cd9e6f01af9255c1426c009a620bbb9efbd63':
  Import revised translations.  DO NOT MERGE
 2011-11-09 23:18:05 +00:00
Amith Yamasani
236a370c25 am da7b2289: am 2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1 
* commit 'da7b2289255cdf48851014f87e1c1032094a89f0':
  Remove system tutorial option in Settings->About.
 2011-11-09 21:24:48 +00:00
Jeff Brown
c7bd0e7b40 am 5d549f97: am 81dfecf8: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit '5d549f972b6c1b86b33b5d089e24f7b96b7546c8':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 21:24:48 +00:00
Peter Ng
1c1c5084c1 am 6312987d: am 2215abe9: Decreased padding on switches in settings to fix bluetoot 
* commit '6312987da231167647dfc50c37f98ad621f2caf8':
  Decreased padding on switches in settings to fix bluetoot
 2011-11-09 21:24:47 +00:00
Amith Yamasani
b25208d878 am a2ca9269: am 2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 
* commit 'a2ca9269f2f8a94063489974d6a08fd1e5031482':
  Prevent orphaned fragment on the settings stack.
 2011-11-09 21:24:47 +00:00
Amith Yamasani
da7b228925 am 2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1 
* commit '2ad06bbd5f7a1b836ad3536e96817d7ec29a2e70':
  Remove system tutorial option in Settings->About.
 2011-11-09 21:19:23 +00:00
Jeff Brown
5d549f972b am 81dfecf8: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit '81dfecf8ba6a603fd8974640517966c3a8930be3':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 21:19:23 +00:00
Peter Ng
6312987da2 am 2215abe9: Decreased padding on switches in settings to fix bluetoot 
* commit '2215abe996690ce619170240e0a617ed5a34b2ed':
  Decreased padding on switches in settings to fix bluetoot
 2011-11-09 21:19:22 +00:00
Amith Yamasani
a2ca9269f2 am 2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 
* commit '2eb32b00775b6e308e1c422856c1046c6c33b54a':
  Prevent orphaned fragment on the settings stack.
 2011-11-09 21:19:22 +00:00
Danielle Millett
8a7cd212e6 am 8de5cf51: am 179b3286: Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1 
* commit '8de5cf5126c7ac1cae93b391af889b0c4fb249a9':
  Adding an improve face matching settings option for Face Unlock
 2011-11-09 17:53:46 +00:00
Danielle Millett
8de5cf5126 am 179b3286: Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1 
* commit '179b32869c4476a30b0c933fb73a1a8e258ce11c':
  Adding an improve face matching settings option for Face Unlock
 2011-11-09 17:52:31 +00:00
The Android Automerger
7b05de8974 merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:47:54 -08:00
Robert Greenwalt
79691fc177 am d476dd09: am 322da591: Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1 
* commit 'd476dd09a2930516ef3cb1f745d53a06616813a4':
  Wimax : 4G settings menu and 4G MAC address.
 2011-11-09 14:37:22 +00:00
Robert Greenwalt
d476dd09a2 am 322da591: Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1 
* commit '322da5917467f9b7b100c35f7c24bee5c9bc3909':
  Wimax : 4G settings menu and 4G MAC address.
 2011-11-09 14:34:21 +00:00
Eric Fischer
de8cd9e6f0 Import revised translations. DO NOT MERGE 
Change-Id: I57c6d5fdf39f880dab16d5db78bc6673d74090a9
 2011-11-08 17:42:11 -08:00
Amith Yamasani
2ad06bbd5f Merge "Remove system tutorial option in Settings->About." into ics-mr1 2011-11-08 17:30:23 -08:00