Commit Graph

15 Commits

Author SHA1 Message Date
Freeman Ng
56a52c5aec resolved conflicts for merge of 59561e0a to master
Change-Id: I9d031ce8f9627bb5e8b28f867e2890c354856df9
2010-10-13 19:09:08 -07:00
Freeman Ng
2fc2ba11fe Hide "System tutorial" option if there's no IME tutorial
bug: 3074212

Change-Id: I3653c23cd893114cec7822efb2d6acb08b7ba91e
2010-10-11 18:51:34 -07:00
Dianne Hackborn
3784d003b8 am 805ad7d1: am 4749fcf7: More tricksy.
Merge commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d'

* commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d':
  More tricksy.
2010-08-23 12:01:51 -07:00
Dianne Hackborn
4749fcf762 More tricksy.
Change-Id: I4752344e0eea302ba28e907ff5bd5c20f74a82b7
2010-08-19 18:21:31 -07:00
Amith Yamasani
d79934731c Refactor settings top level activities to use fragments.
Added a base class SettingsPreferenceFragment from which the settings activities should
be derived so that they can behave like fragments. It contains some commonly called
utility methods and dialog conversion to DialogFragment.

Some of the top-level activities can be launched directly without the left pane.
Settings.java acts as a proxy activity that contains just that settings fragment without
the left pane.

There are still a lot of second and third level activities that need to be fragmentized.
This is just the first pass to test the 2-pane layout.
2010-08-18 22:59:33 -07:00
Dianne Hackborn
3673546205 More version info.
Change-Id: I006951028135e95ce7bb2463f00649a691b5f615
2010-08-11 22:28:29 -07:00
Patrick Auchter
a6b9dcbb16 Fix regex for optional nested parentheses in kernel compiler string
Change-Id: Ie171148b3846bf6c4fd6a1bb31c87aba8db0eb6a
Signed-off-by: Patrick Auchter <patrick.auchter@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-03-14 10:49:53 -04:00
Wink Saville
a40fb23734 Add Safety information to Settings > About Phone
The Safety information link is stored in a system property, ro.url.safetylegal

If the phone has data connection, select "Safety information" menu will open the
Safety information link.  If there is no data connection for the phone, a message will
pop up which ask user to open Safety information link from PC.

Change-Id: Ia46e2e868ebcda93138cb9f00c978d8ac827022a
2009-09-26 21:10:38 -07:00
Jared Suttles
5807c64631 Allow optional nested parenthesis in the kernel compiler version string.
This fixes parsing of the kernel version string in so that groups
3 and 4 can be shown in About phone.

Submitted on behalf of Patrick Auchter <patrick.auchter@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
2009-08-18 10:26:00 -07:00
The Android Open Source Project
afc4ab2ffb auto import from //depot/cupcake/@135843 2009-03-03 19:32:34 -08:00
The Android Open Source Project
4e14e5ccbf auto import from //depot/cupcake/@135843 2009-03-03 18:28:52 -08:00
The Android Open Source Project
b9f5851434 auto import from //branches/cupcake/...@131421 2009-02-13 12:57:53 -08:00
The Android Open Source Project
1feaa85791 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:05 -08:00
The Android Open Source Project
abc48f80d8 Code drop from //branches/cupcake/...@124589 2008-12-17 18:06:01 -08:00
The Android Open Source Project
de2d9f5f10 Initial Contribution 2008-10-21 07:00:00 -07:00