Commit Graph

2084 Commits

Author SHA1 Message Date
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
Peter Ng
0938154d2d 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 14:37:42 +00:00
Amith Yamasani
2ad06bbd5f Merge "Remove system tutorial option in Settings->About." into ics-mr1 2011-11-08 17:30:23 -08:00
Peter Ng
2215abe996 Decreased padding on switches in settings to fix bluetoot
Bug: 5525612
Change-Id: Id93e4aae8b1e36614383a09266ce6c3f715404ab
2011-11-08 16:14:20 -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
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
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
Eric Fischer
cd05bf5eff am ab300c9d: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'ab300c9d2397bc8805a9dc4fbbfa07db7417fb09':
  Import revised translations.  DO NOT MERGE
2011-11-07 20:41:35 +00:00
Eric Fischer
3795e49084 Import revised translations. DO NOT MERGE
Change-Id: I50121e852a98db6c4e0cece356cceba3e3f1ccc1
2011-11-07 12:27:48 -08:00
Daniel Sandler
f11106e1a9 am f53c3602: Bring back Android Dreams.
* commit 'f53c3602f92d623f03e941c1d590a4720578cf5e':
  Bring back Android Dreams.
2011-11-03 10:58:31 +00:00
Daniel Sandler
f53c3602f9 Bring back Android Dreams.
Bug: 5121105
Change-Id: I29ddee7e4a83a01844cdb735de14c02dcbf3086c
2011-11-02 23:30:27 -04:00
Eric Fischer
94a1389f9c am 17347407: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '17347407edd61fc15a316fa7aa55c17b399433ea':
  Import revised translations.  DO NOT MERGE
2011-11-01 20:53:30 +00:00
Eric Fischer
78730481fe Import revised translations. DO NOT MERGE
Change-Id: I65499d2eade80a1bb57f7f6fe27018c106554300
2011-11-01 13:37:58 -07:00
Ed Heyl
a762e1d708 Merge remote branch 'goog/ics-mr1' into ics-aah 2011-10-31 05:54:48 -07:00
Eric Fischer
05b52f122e Import revised translations. DO NOT MERGE
Change-Id: I8a28a888b322b379800fae19299e91a3b485b2f8
2011-10-28 13:54:20 -07:00
Mike J. Chen
ef4eb89d71 Allows auto dismissing of bluetooth activation dialogs
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.

Change-Id: I23c2d1483a4d71b0025624c2e4aaacc688de3260
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-10-27 17:39:54 -04:00
Eric Fischer
d7cb5c7359 Import revised translations. DO NOT MERGE
Change-Id: I22ad234b19bb6270f7edd9461590d119d7dc4eff
2011-10-26 17:40:52 -07:00
Eric Fischer
59ecd1667a Import revised translations. DO NOT MERGE
Change-Id: I9d5e132b9d4a9e505269ef9998acabfba8ffa975
2011-10-26 11:09:44 -07:00
Ed Heyl
5f4cda3888 merge ics-mr0
Change-Id: I264e87a888059ada62b56a3ff7acf44cb0657cb8
2011-10-25 20:19:41 +00:00
Eric Fischer
caf76c08b3 Import revised translations. DO NOT MERGE
Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295
2011-10-24 17:09:58 -07:00
Eric Fischer
d27a632d94 Import revised translations. DO NOT MERGE
Change-Id: I1ccc1ed633e301bb2db039ea8ce1041a00daccc3
2011-10-21 14:41:59 -07:00
Eric Fischer
388c9e2f14 Import revised translations. DO NOT MERGE
Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c
2011-10-20 18:04:50 -07:00
Eric Fischer
49a681c492 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-20 11:29:07 -07:00
Eric Fischer
e373aa16f7 Import revised translations. DO NOT MERGE
Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886
2011-10-20 11:16:21 -07:00
Danielle Millett
d4227b0386 am 8123493e: Fix 5428748: Added more options for biometric weak
* commit '8123493ef905a210bd00b0c623459f4c86505298':
  Fix 5428748: Added more options for biometric weak
2011-10-19 15:14:41 -07:00
Danielle Millett
8123493ef9 Fix 5428748: Added more options for biometric weak
Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.

Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
2011-10-19 13:58:30 -04:00
Eric Fischer
05a81a9521 Merge "Import revised translations." 2011-10-18 16:35:18 -07:00
Eric Fischer
715a9ad8e9 Import revised translations.
Change-Id: I257f94325e7f588845bcf446e497ff827d4b2cec
2011-10-18 15:45:53 -07:00
Eric Fischer
3d0b525491 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-18 11:31:06 -07:00
Eric Fischer
d31802575e Import revised translations. DO NOT MERGE
Change-Id: Idddc20bec80db65304678bc5ad191cff3f2d2c5f
2011-10-18 11:13:37 -07:00
Peter Ng
433bdb751f Merge "data usage color standardization" 2011-10-18 10:45:34 -07:00
Danielle Millett
0206fcd315 am 4c9a5fe6: Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0
* commit '4c9a5fe6a3765ecd7617b611463766cd72706458':
  Fix 5466557: Removed secondary screenlock settings labels
2011-10-18 10:29:48 -07:00
Danielle Millett
4c9a5fe6a3 Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0 2011-10-18 10:27:41 -07:00
Justin Ho
ba24671c2c am 6ab0c12c: Updated bandwidth assets
* commit '6ab0c12ca417aef49d2c287b8d215c9e66ae154d':
  Updated bandwidth assets
2011-10-18 09:33:09 -07:00
Justin Ho
6ab0c12ca4 Updated bandwidth assets
Change-Id: Ia180ff9dfb020ab2f3528638f522c38f11ea010f
2011-10-17 18:09:43 -07:00
Danielle Millett
80412e70db Fix 5466557: Removed secondary screenlock settings labels
Removed summary line from the screen lock picker and displaying
the about screen for face unlock every time instead of just the
first time

Change-Id: Iac572d2366acf28d32e632e8dcdde63475641e39
2011-10-17 20:57:17 -04:00
Peter Ng
0c0e41b17f data usage color standardization
Change-Id: I7c46ecd5b0730dc524bc788cb941493f3534cb20
2011-10-17 17:39:16 -07:00
Justin Ho
4a451ba8f1 am 7a33de4c: Merge "Update wifi icons" into ics-mr0
* commit '7a33de4c004c9093682b54afa3deab2fdf9ed5f6':
  Update wifi icons
2011-10-17 16:34:41 -07:00
Justin Ho
7a33de4c00 Merge "Update wifi icons" into ics-mr0 2011-10-17 16:33:07 -07:00
Justin Ho
e8fb5b8aa1 Update wifi icons
Change-Id: I7a82b96df6c44bc17d70631ef36dc5ad733515c4
2011-10-17 16:04:31 -07:00
John Huang
f9389c7ef0 am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0
* commit '7b21e97c2a213afbb7ab0d2247e751e8194f89fc':
  Add "Roaming protocol" to APN editor.
2011-10-17 15:22:28 -07:00
John Huang
7b21e97c2a Merge "Add "Roaming protocol" to APN editor." into ics-mr0 2011-10-17 15:20:28 -07:00
Claudia de Veaux
1aa9c67783 Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232" 2011-10-17 14:20:29 -07:00
Claudia de Veaux
7dc36b90ce Restore Wi-Fi spelling; change "extra-large" to "huge".
Bugs: 5467607, 5163232

Change-Id: Ia0085a085b6f2d1ec9d5a00d08dee4bb38b10f22
2011-10-17 12:54:20 -07:00
Eric Fischer
e5bfb640fb Fix capitalization of Face Unlock.
Bug 5447766

Change-Id: I4a91bd00bb09251af170ca054a8aa0bd88c5eec0
2011-10-17 11:28:34 -07:00
John Huang
d0de427f9a Add "Roaming protocol" to APN editor.
Field already exists in the APN database.  Now it is user updatable.
Only enable it on CDMA for this release (means it is not really user
visible, but available for testing purposes).  Will revisit enabling
for all in a future release.

Bug: 5420680
Change-Id: Ia2c551c48ae9ce47c57ad36ec73d152441a27284
2011-10-16 14:35:00 -07:00