Commit Graph

3201 Commits

Author SHA1 Message Date
Fabrice Di Meglio
22af594c04 Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev 2012-05-24 11:37:07 -07:00
Fabrice Di Meglio
c18cc43b28 Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
- use an ID instead of a String for StorageVolume description
- use this ID for getting the correct localized version of the description string

Change-Id: If66868ecc84297322cb9a3f0b2d834f79dd019ca
2012-05-24 11:35:09 -07:00
Jeff Sharkey
a3a40f724e am a655a2f4: Merge "Only show ethernet when traffic has occurred." into jb-dev
* commit 'a655a2f48e61dd44ee9f14585e0ee89202412158':
  Only show ethernet when traffic has occurred.
2012-05-24 11:28:17 -07:00
Jeff Sharkey
a655a2f48e Merge "Only show ethernet when traffic has occurred." into jb-dev 2012-05-24 11:25:55 -07:00
Jeff Sharkey
b67c4a8e73 Only show ethernet when traffic has occurred.
Bug: 6231172
Change-Id: I24dfd5f998b4e96681813c9fd7ce1ed74cf30eb5
2012-05-24 11:01:29 -07:00
Amith Yamasani
8ad7abbcf6 Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method" 2012-05-24 09:48:21 -07:00
Amith Yamasani
5c68e12493 Don't show SIM LOCK settings if there's no Icc card.
Bug: 6525359

Change-Id: I7bf2a1799ca3032a5dbfa15320d862195b9659f7
2012-05-23 17:20:01 -07:00
Amith Yamasani
9e18432664 am 6e9e5195: Merge "Fix crash when removing an account." into jb-dev
* commit '6e9e519560a50d735ea3c2ddd01d9b7a9cc1d89b':
  Fix crash when removing an account.
2012-05-23 14:36:50 -07:00
Amith Yamasani
6e9e519560 Merge "Fix crash when removing an account." into jb-dev 2012-05-23 14:34:15 -07:00
Amith Yamasani
e88be4f620 Fix crash when removing an account.
Bug: 6494527
Change-Id: I9ab3b54ac4e4d679fd9ec22ab438b9e1ea0be2b1
2012-05-23 14:13:13 -07:00
Michael Kolb
34382357f5 am 9d5a6eb4: Match setup wizard wifi settings with new wireframes
* commit '9d5a6eb4d7ec662e666dc5dfe1506616d5b59341':
  Match setup wizard wifi settings with new wireframes
2012-05-23 11:31:51 -07:00
Michael Kolb
9d5a6eb4d7 Match setup wizard wifi settings with new wireframes
Bug: 6521472

Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
2012-05-23 11:19:47 -07:00
John Spurlock
4c63ec42c1 am 3a821e86: Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev
* commit '3a821e86f5851cbce1185a481acb88a0f33c98ae':
  Settings: "Rotation lock" retains existing orientation.
2012-05-23 05:39:01 -07:00
John Spurlock
3a821e86f5 Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev 2012-05-23 05:29:56 -07:00
Vikram Aggarwal
bccd90e6ba am ff78bf72: Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev
* commit 'ff78bf7280b2f435bf09e0df0f252506b1c6af61':
  Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
2012-05-22 14:52:40 -07:00
Vikram Aggarwal
ff78bf7280 Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev 2012-05-22 14:50:48 -07:00
Vikram Aggarwal
f576dd6c9f Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
Fix b/6531158 (Stop showing the keyboard)

Fix b/6532201 (Stop removing the text view, and prompt the user with a message)

Fix b/6155075 (Stop listening to MCC/MNC changes)

Change-Id: Ibf8414fe57bdd0acf6c20f3194c52b168b9292c6
2012-05-22 14:37:19 -07:00
Andrew Flynn
f89dc7c93a am be4a0325: Merge "Update WPS Dialog" into jb-dev
* commit 'be4a032581ae6dfb41662486085e64052d085314':
  Update WPS Dialog
2012-05-22 11:41:21 -07:00
Andrew Flynn
2e39ebfeaf Update WPS Dialog
- Remove title
- Change description text
- Add WPS icon

Bug: 6457246
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
2012-05-22 11:22:02 -07:00
Jean-Baptiste Queru
1a47dff3ce Merge "Remove title bar background drawable from running app detail view" 2012-05-22 07:48:41 -07:00
John Spurlock
523d5a6e04 Settings: "Rotation lock" retains existing orientation.
Enabling "Rotation lock" when in landscape will stay in landscape
instead of forcing to portrait.

Bug: 6481542
Change-Id: Ide6171437a207f97a8fc3123ad8b2fe27323336f
2012-05-22 09:51:02 -04:00
Svetoslav Ganov
fb59d66a4e am 8d43aeae: Merge "Updating the checkbox state to match the title." into jb-dev
* commit '8d43aeae0347435a03e4007eef5fce578ec50184':
  Updating the checkbox state to match the title.
2012-05-21 14:12:43 -07:00
Svetoslav Ganov
8d43aeae03 Merge "Updating the checkbox state to match the title." into jb-dev 2012-05-21 14:09:27 -07:00
Jeff Brown
0ee87ab22a am 766b2861: Add UI to select multiple keyboard layouts.
* commit '766b286187d02b3da6e0142376a4478072f30a16':
  Add UI to select multiple keyboard layouts.
2012-05-20 21:53:26 -07:00
Jeff Brown
766b286187 Add UI to select multiple keyboard layouts.
Bug: 6405203
Change-Id: I27ca4630aebcb39b83298d37d8fb3f4ef0080317
2012-05-20 14:56:42 -07:00
Svetoslav Ganov
2121f097c0 Updating the checkbox state to match the title.
1. Now the the setting is names lock screen rotation
   which is the opposite as it was before so this
   patch reverses the checkbox state.

bug:6507335

Change-Id: Ic0aab21fa70871f64e37ac05f7917d69f9c0a0df
2012-05-18 18:00:31 -07:00
Svetoslav Ganov
c19be29cd7 am fc16237d: Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev
* commit 'fc16237d5debc7375be1d485e510df2156d8da0f':
  Removed Accessibility tutorial and orphaned resources.
2012-05-18 15:59:23 -07:00
Irfan Sheriff
41f88da823 am ee7589c0: Merge "Fix p2p settings crash" into jb-dev
* commit 'ee7589c02ab2cf4a4169531df54595f81f0d88a0':
  Fix p2p settings crash
2012-05-18 15:59:22 -07:00
Svetoslav Ganov
fc16237d5d Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev 2012-05-18 15:21:23 -07:00
Irfan Sheriff
ee7589c02a Merge "Fix p2p settings crash" into jb-dev 2012-05-18 15:10:41 -07:00
alanv
a9ca65723c Removed Accessibility tutorial and orphaned resources.
Change-Id: Ic96e002b04bed4c525fe959a3ad7e55d8709c75f
2012-05-18 14:28:53 -07:00
Jeff Sharkey
71f7998304 am 409433e9: Merge "Avoid NPE until we understand better." into jb-dev
* commit '409433e904f9b8a65a87274b7d5f582f0ac46e26':
  Avoid NPE until we understand better.
2012-05-18 14:21:40 -07:00
Svetoslav Ganov
7c0a86efe0 am 6a09c07b: Merge "Removing explore by touch from settings." into jb-dev
* commit '6a09c07b20e2a99a86882ecb8c30ee35f6c6f4ca':
  Removing explore by touch from settings.
2012-05-18 14:21:39 -07:00
Michael Kolb
a63bda69d7 am 5dfc5053: Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev
* commit '5dfc505301f70de24adf0724fb270ab3d5b5cd9b':
  Add seperate activity for setup wizard wifi picker to adjust theme
2012-05-18 14:21:38 -07:00
Jeff Sharkey
409433e904 Merge "Avoid NPE until we understand better." into jb-dev 2012-05-18 14:05:25 -07:00
Jeff Sharkey
3da415f19b Avoid NPE until we understand better.
Bug: 6450986
Change-Id: I68af8fedc419cd3142ba2bb7530b77aca7718123
2012-05-18 14:00:10 -07:00
Svetoslav Ganov
6a09c07b20 Merge "Removing explore by touch from settings." into jb-dev 2012-05-18 13:50:37 -07:00
Irfan Sheriff
db3d4bb8c4 Fix p2p settings crash
- Restore on orientation change
- Use appropriate string for dialog

Bug: 6456079
Bug: 6463563
Change-Id: I1fa0b90a14d09608b580ebf3d66b92fc8721eae7
2012-05-18 13:27:05 -07:00
Michael Kolb
5dfc505301 Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev 2012-05-18 13:23:43 -07:00
Svetoslav Ganov
ec94c78ec8 Removing explore by touch from settings.
1. Now accessibility services request this mode and
   we show a dialog so the user can give a consent.
   Accessibility servces can toggle this mode at
   runtime from their settings, for example.

bug:5932640

Change-Id: Id4d3e9c83c488f97b7e53d4baadf7de886958a4d
2012-05-18 12:35:58 -07:00
Michael Kolb
b5f006bf97 Add seperate activity for setup wizard wifi picker to adjust theme
Bug: 6517721

Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e
2012-05-18 11:23:48 -07:00
Dianne Hackborn
d3bacbfa3e am 7d2658ff: Merge "Fix issues 6512411 and 6512951 in ManageApplications." into jb-dev
* commit '7d2658ffbf1b6bfcf51a28de5ea98293245f7ebe':
  Fix issues 6512411 and 6512951 in ManageApplications.
2012-05-17 18:17:50 -07:00
Dianne Hackborn
7d2658ffbf Merge "Fix issues 6512411 and 6512951 in ManageApplications." into jb-dev 2012-05-17 18:15:44 -07:00
Dianne Hackborn
a4af18755e Fix issues 6512411 and 6512951 in ManageApplications.
6512411 java.lang.IndexOutOfBoundsException: Invalid index 0, size is 0
6512951 Settings crash while returning from App info screen

Also fix padding around the UI, and display of storage use.

Change-Id: Ibfcfe1a4a80f25f81ba2cabbb2e3d60aaa9ac04e
2012-05-17 18:15:28 -07:00
Jeff Brown
cb94584629 am 796e0a09: Merge "Add support for grouping keyboard layouts by collection." into jb-dev
* commit '796e0a0960ae59d8406f62138f6259f4170e5b90':
  Add support for grouping keyboard layouts by collection.
2012-05-17 17:17:13 -07:00
Jeff Brown
796e0a0960 Merge "Add support for grouping keyboard layouts by collection." into jb-dev 2012-05-17 16:33:46 -07:00
Jeff Brown
a350352e03 Add support for grouping keyboard layouts by collection.
Bug: 6405203
Change-Id: I458c4976562ecea2fa03d96258ff28ebbdc95294
2012-05-17 16:02:38 -07:00
Russell Brenner
737d5aa9cf am 1c0a8f95: Merge "Wifi select screen redlines" into jb-dev
* commit '1c0a8f953ba85bd21660a44dbbf891f313367196':
  Wifi select screen redlines
2012-05-17 12:51:32 -07:00
Russell Brenner
1c0a8f953b Merge "Wifi select screen redlines" into jb-dev 2012-05-17 12:49:15 -07:00
Daniel Sandler
527a669330 am 70b59998: Refinements to notification controls in Settings.
* commit '70b599983967b68894a9c41df2279424f6ab3fef':
  Refinements to notification controls in Settings.
2012-05-17 10:27:24 -07:00