summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix battery usage screen issuesJason Monk2015-06-0221-54/+88
| | | | | | | | | | | | Tint icons properly Bug: 21077770 Show better icons for wifi and bt (remove the old ones) Bug: 21172936 Also add a way to show fake items in power list for testing. Change-Id: I6b6804673a68190ebc3f2ea32802e30811a7f5b2
* Bluetooth: Acquire wakelock to turn on LCD for MAP authorizationHemant Gupta2015-06-021-0/+8
| | | | | | | | | | This patch acquires a wakelock to turn on the LCD display if the screen is off during an access request for MAP. Without this patch it was observed that if the screen was off, the LCD remained off for incoming connection access request from remote devices and the user only heard the notification sound without the LDC being lit up. Change-Id: I87c296fce4cd8e0c133f74169d991eee263fed08
* Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-devAndre Eisenbach2015-06-021-3/+13
|\
| * Bluetooth PAN: Set isPreferred to true (2/2)Andre Eisenbach2015-06-021-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | isPreferred must always be true for PAN so that the DUT can initiate a PANU connection with the remote device not only from the internet access menu in the profile setting, but also from the paired device list menu. Currently isPreferred is only true when PAN is in connected state for the PANU role, so it will return false when the PAN profile is not connected and the PANU connection will never be initiated from the paired device list menu. Change-Id: I3d52d89136269508ac6416b695b22842f4bb557a
* | Merge "[MasterClear] fix race in showing dialog" into mnc-devAndres Morales2015-06-021-10/+18
|\ \ | |/ |/|
| * [MasterClear] fix race in showing dialogAndres Morales2015-06-011-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | Wiping the PDB effectively starves all other threads from accessing flash, and freezes the UI. We throw up a dialog but there's a race between drawing the dialog and starting the wipe. Show the dialog in onPreExecute to fix this. Bug: 20854355 Change-Id: I8462f5ed3ff53ed574ebc1be416a821c2086b4f5
* | Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-devSanket Padawe2015-06-011-58/+79
|\ \
| * | Fix scrolling issue for Wifi hotspot setup layout.Sanket Padawe2015-06-011-58/+79
| | | | | | | | | | | | | | | Bug: 19856113 Change-Id: Id49ac7c452f10e0de43b18ecdecc68619faecbc3
* | | Merge "Make Theme a DropDownPreference" into mnc-devJason Monk2015-06-014-17/+36
|\ \ \
| * | | Make Theme a DropDownPreferenceJason Monk2015-06-014-17/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make DropDownPreference support xml lists defined the same way as ListPreferences. Bug: 21300431 Change-Id: I1698e8ddcd6134034c3367a6afe36f9740e9efec
* | | | Merge "Change name of search menu item to be more descriptive" into mnc-devJason Monk2015-06-011-1/+1
|\ \ \ \
| * | | | Change name of search menu item to be more descriptiveJason Monk2015-06-011-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | (for accessibility) Bug: 20345352 Change-Id: Id8c74f4bf3753dc36153965923859315ecc07a9a
* | | | Merge "[WifiSetup] Add + icon to Add another network" into mnc-devMaurice Lam2015-06-014-14/+53
|\ \ \ \ | |_|/ / |/| | |
| * | | [WifiSetup] Add + icon to Add another networkMaurice Lam2015-05-294-14/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the + icon to "Add another network" in Wi-Fi screen in setup wizard, and make the text black and sentence case. Bug: 21089864 Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
* | | | Merge "Send sim change notification based on sim state change." into mnc-devSanket Padawe2015-06-013-160/+112
|\ \ \ \
| * | | | Send sim change notification based on sim state change.Sanket Padawe2015-06-013-160/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Send sim change notifications based on Sim state change rather then based on subscription change. + Make SimSettings dynamically update based on subscriptions changed. Would support hotswap which was not supported before this. Bug: 20739298 Bug: 18385348 Change-Id: I5bb4b05f55b94eb0ed2a1a83fe2f168192b2b684
* | | | | Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-devMaurice Lam2015-06-0154-68/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [WifiSettings] Remove unused Wi-Fi iconMaurice Lam2015-05-2954-68/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wifi_signal_light was replaced by wifi_signal (which can take any color via theme attributes). Remove the unused assets. Change-Id: If1823f9fa74ddaeb54f4a79a5d42db3b24f723d9
* | | | | Network Reset should have a lockdown like Factory Reset.Stuart Scott2015-06-016-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:20332322 Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d (cherry picked from commit 176f512c5ad8d8478db88fad4c14ffca52102ade)
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0118-215/+150
| |_|_|/ |/| | | | | | | | | | | | | | | Change-Id: Idf3b09809f2f964abef75349083eb11a2bfc7a8c Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-3077-423/+394
| | | | | | | | | | | | | | | | | | | | Change-Id: I2a83b506d2d5c74818178dbc76b07b2f97ff2c87 Auto-generated-cl: translation import
* | | | Merge "Ignore fp error message when not listening" into mnc-devXiyuan Xia2015-05-301-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Ignore fp error message when not listeningXiyuan Xia2015-05-291-0/+8
| | |/ | |/| | | | | | | | | | Bug:21413567 Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
* | | Hide guest entry if the user is not allowed to create guestFyodor Kupolov2015-05-291-32/+22
|/ / | | | | | | | | | | | | | | Don't show the Guest entry for a secondary user if the user is not allowed to create a guest and there is currently no guest already created. Bug: 19035769 Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
* | Merge "Use DimmableIconPreference for Add user action" into mnc-devFyodor Kupolov2015-05-296-12/+30
|\ \
| * | Use DimmableIconPreference for Add user actionFyodor Kupolov2015-05-196-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved DimmableIconPreference from location to the root package since it is now used in several places. Add user action now uses DimmableIconPreference. Added a new summary string, which is displayed when no more users can be added. Bug: 20892920 Change-Id: I00b00f80ba8933a00a2de85777b9f7e55d03c31b
* | | Merge "Hide the collapse/expand icon if text fits the screen" into mnc-devFyodor Kupolov2015-05-291-3/+25
|\ \ \
| * | | Hide the collapse/expand icon if text fits the screenFyodor Kupolov2015-05-291-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Icon should be hidden if explanation text fits the screen, otherwise user should be able to click the image to collapse/expand the text. Bug: 20554398 Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
* | | | Merge "Move ZoneGetter into SettingsLib" into mnc-devTony Mantler2015-05-293-225/+15
|\ \ \ \
| * | | | Move ZoneGetter into SettingsLibTony Mantler2015-05-283-225/+15
| |/ / / | | | | | | | | | | | | Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-29154-2682/+3773
| | | | | | | | | | | | | | | | | | | | Change-Id: I317a9af71a1ab755f032066f7239c6e1e2f6e5ec Auto-generated-cl: translation import
* | | | Merge "Settings: Migrate zen event conditions to use calendar name." into ↵John Spurlock2015-05-293-17/+19
|\ \ \ \ | | | | | | | | | | | | | | | mnc-dev
| * | | | Settings: Migrate zen event conditions to use calendar name.John Spurlock2015-05-283-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And make sure any existing calendar value always appears in the picker, even before it exists in the calendar provider. Bug: 17755700 Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
* | | | | Merge "Disable back button on crypto screen" into mnc-devPaul Lawrence2015-05-281-8/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Disable back button on crypto screenPaul Lawrence2015-05-271-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The back button cannot do anything from this activity as it is only ever launched first thing at boot. So do not permit going back. Note that screens launched from here (emergency dialer, keyboard config) still work and their back buttons still work. Bug: 20730074 Change-Id: I939e05450e5fbd61d12890325c4afe9dcad35c1e
* | | | | Merge "Make use of WifiTracker's WorkerThread support" into mnc-devJason Monk2015-05-282-44/+78
|\ \ \ \ \
| * | | | | Make use of WifiTracker's WorkerThread supportJason Monk2015-05-282-44/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the AccessPoint callbacks come in on a BG thread and do more of the handling there. Bug: 21486080 Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
* | | | | | Merge "More memory updates" into mnc-devJason Monk2015-05-288-17/+113
|\ \ \ \ \ \
| * | | | | | More memory updatesJason Monk2015-05-288-17/+113
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some string changes - Make processes in memory details not clickable - Put processes in a 'detail' category - Hide processes when an app only has 1 - Add memory item to bottom of app info page Bug: 20694769 Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
* | | | | | Merge "Settings: Update icon sizes for zen auto rules." into mnc-devJohn Spurlock2015-05-283-6/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Settings: Update icon sizes for zen auto rules.John Spurlock2015-05-283-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21474291 Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab
* | | | | | Help fallbacks and intent workJason Monk2015-05-288-32/+53
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Handle a backup URI, so that if the specified URI is not available, another can be used. - Add some data to help intents when they are intent URIs - Fill in the context with a classname when it isn't present Bug: 15475009 Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
* | | | | Fix Eap method selection on screen rotation.Sanket Padawe2015-05-271-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19903254 Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
* | | | | Merge "Honor password visible setting in CryptKeeper" into mnc-devPaul Lawrence2015-05-273-0/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Honor password visible setting in CryptKeeperPaul Lawrence2015-05-273-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires matching framework change: https://googleplex-android-review.git.corp.google.com/#/c/692822/ Bug: 20184626 Change-Id: I04bfb9ed61a7b40fbc28fbc0b4b10bf848b34a2c
* | | | | Merge "[ConfirmCredential] fix issue where patterns of length 4 are not ↵Andres Morales2015-05-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | checked" into mnc-dev
| * | | | [ConfirmCredential] fix issue where patterns of length 4 are not checkedAndres Morales2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2bfcae01be88001a6a9bafa4908305d464522302
* | | | | Merge "Clear only keystore credential entires" into mnc-devChad Brubaker2015-05-271-1/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Clear only keystore credential entiresChad Brubaker2015-05-221-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of reseting the whole user only clear the uids that are used for credential storage. These are limited to only WIFI, VPN, ROOT and System. This prevents applications that use keystore for crypto keys from losing their keys when the user clears credentials. Previously when reset was called the next time the user unlocked the keystore it would be reinitialized with the user's password however this behavior was removed from keystore causing a loop of unlock prompts from CredentialStorage when trying to install a new certificate after clearing the storage. Additionally this makes clear credentials clear any managed profiles as well, previously it only cleared the current user. Bug:21373935 Change-Id: Id86ec0bc66a4f6c0d5e649bead007007e2fc8268
* | | | | Merge "[LockSettings] pipe through HW throttle timeout" into mnc-devAndres Morales2015-05-274-21/+37
|\ \ \ \ \