Commit Graph

6319 Commits

Author SHA1 Message Date
Peter Ng
f1cd9a0045 Merge "Data usage grid asset updates" 2011-10-07 12:32:13 -07:00
Peter Ng
fad1bf3ce7 Data usage grid asset updates
Change-Id: I232e784c8552f4f185814f4d5b8082894438c500
2011-10-06 18:35:13 -07:00
Romain Guy
b1f0cad4fe am 3d32d00e: Fix string for hdpi devices
* commit '3d32d00edd41aaedd426f2ab1a2309a8cd8a03b6':
  Fix string for hdpi devices
2011-10-06 15:18:41 -07:00
Irfan Sheriff
d341bf8519 am 8dcb0252: Merge "Add mobile hotspot provisioning support"
* commit '8dcb0252ea6badf3610c5741f044467bc5ee36d3':
  Add mobile hotspot provisioning support
2011-10-06 15:18:04 -07:00
Romain Guy
3d32d00edd Fix string for hdpi devices
Change-Id: Icfad64a4c7df0a6c68336cc361e60ec626b5d735
2011-10-06 14:37:34 -07:00
Irfan Sheriff
8dcb0252ea Merge "Add mobile hotspot provisioning support" 2011-10-06 12:43:01 -07:00
Irfan Sheriff
aa3d2c406e Add mobile hotspot provisioning support
Bug: 5346812
Change-Id: I3e117fb62039c1d8370440ab4109705894011928
2011-10-06 11:45:45 -07:00
The Android Automerger
519ce2a38d merge in ics-release history after reset to master 2011-10-06 07:01:28 -07:00
Jeff Sharkey
38914c9ad9 am 051cda2e: Merge "Third time is the charm."
* commit '051cda2e46d7b41d6216fe44ce7e0af35e34e925':
  Third time is the charm.
2011-10-05 22:58:36 -07:00
Jeff Sharkey
051cda2e46 Merge "Third time is the charm." 2011-10-05 22:57:19 -07:00
Jeff Sharkey
3a546ebacb Third time is the charm.
Change-Id: Ic58a7f80e3be0c5d1a0531727f0abac0c8f96fba
2011-10-05 22:54:52 -07:00
Jeff Sharkey
49a2d9bfc9 am 3a5a82c7: Merge "Fix string breakage."
* commit '3a5a82c756f8001fabe1ddd158825565354425a6':
  Fix string breakage.
2011-10-05 22:16:17 -07:00
Jeff Sharkey
3a5a82c756 Merge "Fix string breakage." 2011-10-05 22:14:24 -07:00
Jeff Sharkey
82bf63496b Fix string breakage.
Change-Id: Ib81c1bfd9ef49f7e410887ab5c22e3e3cc31ca22
2011-10-05 22:13:02 -07:00
Jeff Sharkey
da5bc13f8c am 0c927302: Merge "Adjust data usage strings."
* commit '0c927302d7b05c4c9bc6a5d28669ed57e7804388':
  Adjust data usage strings.
2011-10-05 22:01:50 -07:00
Jeff Sharkey
0c927302d7 Merge "Adjust data usage strings." 2011-10-05 21:59:42 -07:00
Danielle Millett
5d962052ba am c7a15ec8: Merge "Update string to match wireframe"
* commit 'c7a15ec8e8fb30fe2b613b98c61d66e4ecc3960c':
  Update string to match wireframe
2011-10-05 19:06:08 -07:00
Danielle Millett
c7a15ec8e8 Merge "Update string to match wireframe" 2011-10-05 19:04:05 -07:00
Danielle Millett
76d9af0a87 Update string to match wireframe
Change-Id: If406ab1364451e28352d120b473a7a58a124bff4
2011-10-05 21:49:03 -04:00
Jeff Sharkey
d86e9b207a Adjust data usage strings.
Bug: 5337015
Change-Id: I55c7ea8175945a6d799845e196299d45bb412403
2011-10-05 17:44:12 -07:00
Jeff Brown
873ae2d9d7 am cbf312ec: Use WM APIs to change rotation preference. Bug: 5371750
* commit 'cbf312ec2984dcc42bc39b01f4b126b0901740cf':
  Use WM APIs to change rotation preference. Bug: 5371750
2011-10-05 17:25:48 -07:00
Jeff Brown
cbf312ec29 Use WM APIs to change rotation preference.
Bug: 5371750

Changing the system setting directly results in inconsistent
behavior among the three different places where "auto-rotate"
settings appear in the UI.  Use the WM APIs instead.

Change-Id: I1a8239af66b1cc3aeec8310383e72fc96c878d73
2011-10-05 16:12:27 -07:00
The Android Automerger
ba0a98c08a merge in ics-release history after reset to master 2011-10-05 06:59:31 -07:00
Narayan Kamath
fbfdcffa4b am 3f28ff1a: Merge "Don\'t hide TTS settings if no recognizer is found."
* commit '3f28ff1a065d713480cc5422a702373c2ffb280a':
  Don't hide TTS settings if no recognizer is found.
2011-10-05 06:37:56 -07:00
satok
a50721e543 am a43dd396: Show a security warning dialog when switching a spell checker
* commit 'a43dd3962eaf9df8cbd7c8fcf8dab96fcb428b91':
  Show a security warning dialog when switching a spell checker
2011-10-05 06:37:42 -07:00
Danielle Millett
d188d341ea am b965e1cc: Merge "Showing tutorial for Face Unlock on first try"
* commit 'b965e1ccd78980390be89f95ad0fe38ed81e7657':
  Showing tutorial for Face Unlock on first try
2011-10-05 06:37:04 -07:00
Narayan Kamath
3f28ff1a06 Merge "Don't hide TTS settings if no recognizer is found." 2011-10-05 05:11:09 -07:00
Narayan Kamath
e247cb8299 Don't hide TTS settings if no recognizer is found.
bug:5412210
Change-Id: I6fdfda7f5f7bcd22acda2fd2b55e0d76f0fab1cd
2011-10-05 13:03:41 +01:00
satok
a43dd3962e Show a security warning dialog when switching a spell checker
Bug: 5402295

Change-Id: I021e6e923fa137248d23c8fa39e68afdf73fead9
2011-10-05 19:11:28 +09:00
Danielle Millett
b965e1ccd7 Merge "Showing tutorial for Face Unlock on first try" 2011-10-04 18:45:03 -07:00
Danielle Millett
c82ba86375 Showing tutorial for Face Unlock on first try
Change-Id: Idf072750e70a9e5bc7699675d8a7a9c57900eea3
2011-10-04 21:00:07 -04:00
Amith Yamasani
8cfe36a313 am 040ad494: Merge "Handle unexpected null cursor and don\'t forget to close it."
* commit '040ad494c5560e83ab8c0414b303aa3f1e1f34bf':
  Handle unexpected null cursor and don't forget to close it.
2011-10-04 15:30:12 -07:00
Amith Yamasani
040ad494c5 Merge "Handle unexpected null cursor and don't forget to close it." 2011-10-04 15:28:06 -07:00
Eric Fischer
f21ca26174 am dfb894c1: Fix mismatched markup in Settings strings.
* commit 'dfb894c1361545a574dc45bcd956c7830238553c':
  Fix mismatched markup in Settings strings.
2011-10-04 15:14:45 -07:00
Eric Fischer
dfb894c136 Fix mismatched markup in Settings strings.
Revert "Revert "Settings strings cleanup per standards.""

Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design.
Will file separate bug to have the titles removed properly;
for now I just made the string empty.

This reverts commit e2db5875f6.

Change-Id: I0f865d1441d990e5e63f2a257a27ae521220af14
2011-10-04 15:07:16 -07:00
Amith Yamasani
c86755bfd5 Handle unexpected null cursor and don't forget to close it.
Bug: 5406071
Change-Id: Ia40cf7e5a3e32d6f364e787ee66580c685507571
2011-10-04 15:00:21 -07:00
Amith Yamasani
e81cc1f0f1 am fbcad75a: Merge "Introduce half-brightness icon in Power Control widget."
* commit 'fbcad75a84fdbfe91cfdcc62e70f441d2ceb06ca':
  Introduce half-brightness icon in Power Control widget.
2011-10-04 14:04:54 -07:00
Amith Yamasani
fbcad75a84 Merge "Introduce half-brightness icon in Power Control widget." 2011-10-04 14:03:47 -07:00
Adam Powell
887cda2f4b am 155c427e: Merge "Bug 5126088 - update layout for activate device policy activity"
* commit '155c427e0bec0ded9b273db1022d16c0437059d8':
  Bug 5126088 - update layout for activate device policy activity
2011-10-04 13:55:49 -07:00
Adam Powell
155c427e0b Merge "Bug 5126088 - update layout for activate device policy activity" 2011-10-04 13:53:06 -07:00
Adam Powell
a70e1468cf Bug 5126088 - update layout for activate device policy activity
Change-Id: Ifd5963adc0dc30c0a650bac822dbbd7cb938c144
2011-10-04 13:48:50 -07:00
Steven Ross
542d00c0ba am 2d53e1a5: Merge "Formatting fix"
* commit '2d53e1a5d27e27e7d83474c9cd9e3f5c4ed49a91':
  Formatting fix
2011-10-04 13:06:36 -07:00
Steven Ross
2d53e1a5d2 Merge "Formatting fix" 2011-10-04 13:03:38 -07:00
Claudia de Veaux
649b34b0cf am bbb7097a: Merge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug t
* commit 'bbb7097a6871ae463fb865c7fe47c5500f5a6c6a':
  Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"
2011-10-04 12:54:01 -07:00
Claudia de Veaux
bbb7097a68 Merge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"" 2011-10-04 12:52:16 -07:00
Claudia de Veaux
e2db5875f6 Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"
This reverts commit c9c29d90f7
2011-10-04 12:51:23 -07:00
Dianne Hackborn
5922ee6744 am e6abedd6: Merge "Account for all wake lock usage."
* commit 'e6abedd6b88b14101a00877be1255c1094b76e55':
  Account for all wake lock usage.
2011-10-04 11:54:19 -07:00
Dianne Hackborn
e6abedd6b8 Merge "Account for all wake lock usage." 2011-10-04 11:51:54 -07:00
Claudia de Veaux
496be57ef6 am 2e0143b4: Merge "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have t
* commit '2e0143b415b07f126100c6ceb89698e1e7e5e06d':
  Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty.
2011-10-04 11:31:56 -07:00
Claudia de Veaux
2e0143b415 Merge "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty." 2011-10-04 11:30:03 -07:00