Commit Graph

6199 Commits

Author SHA1 Message Date
The Android Automerger
ccd3aa0497 merge in ics-release history after reset to master 2011-10-20 07:01:56 -07:00
Danielle Millett
697476f856 am d4227b03: am 8123493e: Fix 5428748: Added more options for biometric weak
* commit 'd4227b03869be8dff3150aaf62f435c39f1f6771':
  Fix 5428748: Added more options for biometric weak
2011-10-19 15:16:14 -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
The Android Automerger
aacab48ecc merge in ics-release history after reset to master 2011-10-19 07:45:04 -07:00
Chih-Chung Chang
92f7fc5f14 am e790a067: am 0bcd8a95: Fix 5352588: Accept view intent without URI.
* commit 'e790a067cbed209bc0bcf1d5e47c91904f032869':
  Fix 5352588: Accept view intent without URI.
2011-10-19 03:36:08 -07:00
Chih-Chung Chang
e790a067cb am 0bcd8a95: Fix 5352588: Accept view intent without URI.
* commit '0bcd8a95a96566d9e2c97c3305ee0dccf758ca7a':
  Fix 5352588: Accept view intent without URI.
2011-10-19 03:33:46 -07:00
Chih-Chung Chang
0bcd8a95a9 Fix 5352588: Accept view intent without URI.
Change-Id: Ibfcf32a7d27c3ac2d3fa3695e430b3e29f3ecd20
2011-10-19 11:07:19 +08:00
Eric Fischer
77e9229cfc am 05a81a95: Merge "Import revised translations."
* commit '05a81a9521b7462ae07e83aa6be15137a38fe57a':
  Import revised translations.
2011-10-18 16:36:52 -07: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
Amith Yamasani
1f49b54ba5 am a21d6ddc: Merge "Show IP address of current active link instead of just the WiFi IP address."
* commit 'a21d6ddc0b13663aae498c269edaa0458b83a6e5':
  Show IP address of current active link instead of just the WiFi IP address.
2011-10-18 15:06:55 -07:00
Amith Yamasani
a21d6ddc0b Merge "Show IP address of current active link instead of just the WiFi IP address." 2011-10-18 15:05:22 -07:00
Dianne Hackborn
fecfa88dd6 am bc6e8460: am 644fa424: Work on issue #5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500
* commit 'bc6e84602ad715a6014640e412dd9dcc2183ddfd':
  Work on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
2011-10-18 14:39:42 -07:00
Dianne Hackborn
bc6e84602a am 644fa424: Work on issue #5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500
* commit '644fa4243b4c288c85845b3f86aab25135635729':
  Work on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
2011-10-18 14:36:30 -07:00
Dianne Hackborn
644fa4243b Work on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
With the corresponding change for the activity manager to allow the home
activity to finish itself, this activity can now be a little less dirty
and just call finish() when it finds it is not needed.

Change-Id: I1a449c7bec9fba659e27a9e918f8a9b0c55b2098
2011-10-18 13:41:26 -07:00
Svetoslav Ganov
4934c40b43 am abda8c0f: am 39b8eb6c: Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
* commit 'abda8c0fbae8def8368eecd53cda8cda90fa9f41':
  Accessibility service toggle setting state not preserved on screen rotation.
2011-10-18 13:18:25 -07:00
Svetoslav Ganov
abda8c0fba am 39b8eb6c: Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
* commit '39b8eb6ce545287cd77bea465d280772669c68d1':
  Accessibility service toggle setting state not preserved on screen rotation.
2011-10-18 13:16:59 -07:00
Svetoslav Ganov
39b8eb6ce5 Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0 2011-10-18 13:14:38 -07:00
Svetoslav Ganov
96832f8cce Accessibility service toggle setting state not preserved on screen rotation.
The state of the toggle switch for enabling/disabling an accessibility service
is not preserved on screen rotation after its state has been changed once.

bug:5478062

Change-Id: Ie453f78bc07dcd39d88bb4acf260768eccc73a74
2011-10-18 11:58:25 -07:00
Eric Fischer
1cd8cdcbaa am c95b4591: (-s ours) am 3d0b5254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'c95b4591ebbf35564d46d3e555dd2d674c3e2361':
  Import revised translations.  DO NOT MERGE
2011-10-18 11:36:51 -07:00
Eric Fischer
c95b4591eb am 3d0b5254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '3d0b525491559f59d65156fca5783f80f2bddc14':
  Import revised translations.  DO NOT MERGE
2011-10-18 11:33:36 -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
a426a5d1c2 am 433bdb75: Merge "data usage color standardization"
* commit '433bdb751f3cae10b529a272e1b31f26dc72bd11':
  data usage color standardization
2011-10-18 10:47:46 -07:00
Peter Ng
433bdb751f Merge "data usage color standardization" 2011-10-18 10:45:34 -07:00
Danielle Millett
4c8ef82c27 am 0206fcd3: am 4c9a5fe6: Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0
* commit '0206fcd315ce5be67feb98dfcb27572664afc9f8':
  Fix 5466557: Removed secondary screenlock settings labels
2011-10-18 10:31:45 -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
4f6038f7d0 am ba24671c: am 6ab0c12c: Updated bandwidth assets
* commit 'ba24671c2c601ba71bde2cf72b252862ccd745d5':
  Updated bandwidth assets
2011-10-18 09:34:37 -07:00
Justin Ho
ba24671c2c am 6ab0c12c: Updated bandwidth assets
* commit '6ab0c12ca417aef49d2c287b8d215c9e66ae154d':
  Updated bandwidth assets
2011-10-18 09:33:09 -07:00
The Android Automerger
931d94e84b merge in ics-release history after reset to master 2011-10-18 07:00:51 -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
Amith Yamasani
6822b749bb Show IP address of current active link instead of just the WiFi IP address.
Bug: 5359194

Show "Unavailable" only if there's no active link.

Change-Id: I82ba6bda3a08ea84080a8d8cda331f22d7c7a2bd
2011-10-17 16:55:54 -07:00
Justin Ho
1035de60eb am 4a451ba8: am 7a33de4c: Merge "Update wifi icons" into ics-mr0
* commit '4a451ba8f1a098e516e9dc77f6cf8166990c88a2':
  Update wifi icons
2011-10-17 16:36:53 -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
fe342db0b0 am f9389c7e: am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0
* commit 'f9389c7ef011010658b854c4040456cf9ca3f03c':
  Add "Roaming protocol" to APN editor.
2011-10-17 15:24:02 -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
7056c28475 am 1aa9c677: Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232"
* commit '1aa9c677832464604fea45ecd100d8f604f150ec':
  Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232
2011-10-17 14:22:45 -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
Eric Fischer
6342580fb7 am e5bfb640: Fix capitalization of Face Unlock.
* commit 'e5bfb640fbf543494e45c4db139477b262879d26':
  Fix capitalization of Face Unlock.
2011-10-17 13:23:12 -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
satok
495bc81b5f am 7ea58d31: Update enabled subtypes in the input method subtype enabler in "onResume"
* commit '7ea58d31646bcfbcdd9ddd0bfdc685ed7ab3f1d8':
  Update enabled subtypes in the input method subtype enabler in "onResume"
2011-10-17 11:38:57 -07:00
Dianne Hackborn
400f48ab8a am 140f6c6c: Fix issue #5460725: Crespo does not fully boot after a wipe
* commit '140f6c6cf705f020c0ee6a2843cf1691cc68e729':
  Fix issue #5460725: Crespo does not fully boot after a wipe
2011-10-17 11:38:56 -07:00
Jeff Sharkey
e4c7ae7403 am f9eca2e0: Data usage chart fixes.
* commit 'f9eca2e0e0dc31fde40cc731c50c3f522f578c69':
  Data usage chart fixes.
2011-10-17 11:38:55 -07:00