Commit Graph

3021 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
cebc56b606 am 6519c610: Merge "Potential fix for monkey crash." into ics-mr1
* commit '6519c610353cdb9ed670913058a1732cf79d6186':
  Potential fix for monkey crash.
2011-11-10 21:12:04 +00:00
Amith Yamasani
6519c61035 Merge "Potential fix for monkey crash." into ics-mr1 2011-11-10 13:09:54 -08: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
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
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
Amith Yamasani
1af528b1ab 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 18:59:13 +00:00
Jeff Brown
48c1d78c2f 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 18:58:59 +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
Amith Yamasani
a10af7c23a 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 14:36:54 +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
Amith Yamasani
2ad06bbd5f Merge "Remove system tutorial option in Settings->About." into ics-mr1 2011-11-08 17:30:23 -08:00
Amith Yamasani
39dd54bee0 Potential fix for monkey crash.
The tab was being changed by a "keypress" after the fragment was
destroyed. Disable the widget until a resume.

Bug: 5157399
Change-Id: Ic1515255052eaea01f71c133d8570f25d65351b2
2011-11-08 15:22:09 -08:00
Jeff Brown
b8dd637887 Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
Bug: 5569662

Change-Id: Ib2a96a27239228123ed53bd0c03ca412bb4357ba
2011-11-08 14:32:29 -08:00
Amith Yamasani
75a51aa6d2 Remove system tutorial option in Settings->About.
It was being activated by third party IMEs that have tutorials. Remove
the code permanently, since we don't support the system tutorial flow
anymore.

Bug: 5425836
Change-Id: I691b8d48309b3dd3a25c9994334dc4692a70e482
2011-11-08 11:08:28 -08:00
Amith Yamasani
2eb32b0077 Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 2011-11-08 10:46:46 -08:00
Danielle Millett
498116df1d 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-08 18:28:19 +00:00
Jason Simmons
f75335564e resolved conflicts for merge of 322da591 to ics-aah
Change-Id: I4cd3301cf448761b2585c16f83787f6f2c9007b9
2011-11-08 10:23:15 -08:00
Danielle Millett
179b32869c Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1 2011-11-08 10:03:17 -08:00
Robert Greenwalt
322da59174 Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1 2011-11-08 10:01:30 -08:00
tk.mun
7c5c16565e Wimax : 4G settings menu and 4G MAC address.
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
2011-11-07 17:16:18 -08:00
Amith Yamasani
5ba0a0295f Prevent orphaned fragment on the settings stack.
Remove the AppDetailsFragment from the stack if DataUsage is being destroyed.

Bug: 5572241
Change-Id: Ifb2c9233bf75c8cc7b43eec5ea3f0c0b0ba65ffe
2011-11-07 15:20:39 -08:00
Danielle Millett
487b16f340 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-07 17:29:22 -05:00
Narayan Kamath
8863e3989c am 8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1
* commit '8214d201db04c27ed82265ec46f85a87f1adf179':
  Fix two bug in the TTS settings.
2011-11-07 15:51:43 +00:00
Narayan Kamath
76afb65d3e am 8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1
* commit '8214d201db04c27ed82265ec46f85a87f1adf179':
  Fix two bug in the TTS settings.
2011-11-07 10:27:53 +00:00