summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-devFabrice Di Meglio2014-07-163-1/+5
|\
| * Fix bug #15702424 add-wifi setting screen has no titleFabrice Di Meglio2014-07-163-1/+5
| | | | | | | | | | | | | | | | - pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID - define a new string for the Activity title - code cleaning: remove a non needed call to getIntent() Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
* | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-07-16110-4173/+20892
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2014-07-16110-4173/+20892
| | | | | | | | | | | | | | | Change-Id: I2e49081933e98dc3109219c21bd737c3e22fd6f7 Auto-generated-cl: translation import
* | | Merge "Accessibility text contrast control" into lmp-devChris Craik2014-07-163-0/+26
|\ \ \
| * | | Accessibility text contrast controlChris Craik2014-07-163-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | b/14624452 Change-Id: I0f6708680eb37cf8e7dc63cae56b639eaf7c8dbd
* | | | Increase oem_unlock_enable char limit for translationAndres Morales2014-07-171-1/+1
| |/ / |/| | | | | | | | | | | Bug: 16220494 Change-Id: I3974b241bc57130e518dab4b20348e698a276854
* | | Merge "Fix bug #16356067 adb shell am start -a ↵Fabrice Di Meglio2014-07-161-0/+6
|\ \ \ | | |/ | |/| | | | android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev
| * | Fix bug #16356067 adb shell am start -a ↵Fabrice Di Meglio2014-07-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | android.settings.DEVICE_INFO_SETTINGS is crashing again - regression from 9717fab53dc65ffe98c0df733b9b4a33bc154496 - add the missing dashboardBackgroundColor attribute to the DialogWhenLarge Themes Change-Id: I9f7e21d33851966350726e4b3bf79a5a4d12a37f
* | | Merge "Avoid removing switch even listener multiple times" into lmp-devLifu Tang2014-07-151-15/+12
|\ \ \
| * | | Avoid removing switch even listener multiple timesLifu Tang2014-07-161-15/+12
| | | | | | | | | | | | | | | | | | | | - Fix b/16118646 Change-Id: I36cdc5c8d98dfb63924737af40efff35b9ca2e66
* | | | Merge "Corrected mispelling in strings.xml" into lmp-devPauloftheWest2014-07-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Corrected mispelling in strings.xmlPauloftheWest2014-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16345771 Bug: 16337577 Change-Id: I63912c51b5483d4adbfc70668318cd14c344d244
* | | | Merge "Added Wifi Assistant Card" into lmp-devPauloftheWest2014-07-1619-59/+276
|\ \ \ \
| * | | | Added Wifi Assistant CardPauloftheWest2014-07-1619-59/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Show Wi-Fi Assistant card above network list that scroll under the action bar with the rest of the list + Display a promo image and text + Clicking "Setup" should link to the selected Wi-Fi assistant app (must be open to 3rd parties) + Touching "No, Thanks" should snooze this card for 30 days / 2nd time 90 / 3rd time 180 days / then forever Bug: 15703202 Change-Id: If74101bea630246c6bda2de3ed79fee72eca4c0c
* | | | | Merge "Make crypt dialogs material" into lmp-devPaul Lawrence2014-07-159-41/+19
|\ \ \ \ \
| * | | | | Make crypt dialogs materialPaul Lawrence2014-07-169-41/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | White on black material theme Center text Remove fade to black task Fix emergency call button Note - does not implement all requirements of frames in the defect. More to follow. Bug: 15328359 Change-Id: I878e59dccffff366ba2484bb77482e168cbd2b81
* | | | | Merge "Added strings for PBAP and MultiSim" into lmp-devPauloftheWest2014-07-151-4/+10
|\ \ \ \ \
| * | | | | Added strings for PBAP and MultiSimPauloftheWest2014-07-161-4/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 16345619 Change-Id: If7165312723316d5fd90a441562617e03023b015
* | | | | Merge "[WifiSetup] Make illustration header not clickable" into lmp-devMaurice Lam2014-07-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [WifiSetup] Make illustration header not clickableMaurice Lam2014-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No more "pop" sound when the illustration is tapped on. Bug: 16331851 Change-Id: Ib528e1d6f669f71e0c2f24164726cee47b06700b
* | | | | Merge "Only show AccountSyncSettings when we have an account" into lmp-devAlexandra Gherghina2014-07-161-44/+48
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Only show AccountSyncSettings when we have an accountAlexandra Gherghina2014-07-161-44/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removes useless list of accounts Bug: 16295803 Change-Id: Ida3c1846327874af9f97695a485b12ec689fd343
* | | | | Fix OwnerInfosFabrice Di Meglio2014-07-151-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use a white background for being in line with the Material Theme - fix padding so that the edge effect is showing full width See bug: #13140648 Settings needs to support the new Quantum Paper theme Change-Id: Iea1cf6b104ee8bf5f311f7d3485d0500884dc57a
* | | | | Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings ↵Fabrice Di Meglio2014-07-155-22/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | app to crash" into lmp-dev
| * | | | | Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to ↵Fabrice Di Meglio2014-07-155-22/+42
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash - fix the way we are passing switchBarMarginStart / switchBarMarginEnd Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1
* | | | | Fix excessively long logtag.Jeff Davidson2014-07-161-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: Idb0846269623550d891d8e98765d630a17da7d14
* | | | Merge "Implement application-level high priority setting." into lmp-devChris Wren2014-07-151-6/+20
|\ \ \ \
| * | | | Implement application-level high priority setting.Chris Wren2014-07-141-6/+20
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 15080024 Change-Id: I87a68cf89a643096ae374d0a808f820814e0b81b Depends-On: Ib1d3b0b5ca4fcfdc52c2cb6838a009b9addf1094
* | | | Merge "Changed text "NFC & More" to "More" and other minor text changes" ↵PauloftheWest2014-07-151-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-dev
| * | | | Changed text "NFC & More" to "More" and other minor text changesPauloftheWest2014-07-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16298245 Change-Id: Id2bf3fc10523372a4f22d1298b57d62a2cc781cc
* | | | | Merge "Adding strings for Call Manager do not merge" into lmp-devPauloftheWest2014-07-151-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adding strings for Call Manager do not mergePauloftheWest2014-07-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16300328 Change-Id: Iac23de5a8668e9f5a4e96225ab48330f10cb1499 (cherry picked from commit da43612e4b06dba0ab0abfb70c92f4b676de5186)
* | | | | Numerous additional strings needed for translation.PauloftheWest2014-07-152-5/+5
| |_|_|/ |/| | | | | | | | | | | | | | | Bug: 16288110 Change-Id: I0701f90f4444700a12f68a2f44598326e94a08ec
* | | | Merge "NotificationStation: Fix crash, use dark theme" into lmp-devChristoph Studer2014-07-145-2/+13
|\ \ \ \
| * | | | NotificationStation: Fix crash, use dark themeChristoph Studer2014-07-145-2/+13
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 15899979 Change-Id: Ieaa65e300cdc9cbed83b601b7a972a1e245c4961
* | | | (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loopsTadashi G. Takaoka2014-07-151-145/+150
| | | | | | | | | | | | | | | | | | | | Change-Id: I1b7d26c37293e03dc20f87d60eb146017a574c47 (cherry picked from commit 61d97ddda8ed09761f48fa1ed7c99b1a6caed948)
* | | | (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bitTadashi G. Takaoka2014-07-151-104/+92
| | | | | | | | | | | | | | | | Change-Id: Id91b62ed084f98e3a6dc724aac9d926d89a96201 (cherry picked from commit a5db65fe11f862747c34f271ea416052c653300d)
* | | | Merge "Setup Wizard string refresh" into lmp-devRussell Brenner2014-07-151-4/+10
|\ \ \ \
| * | | | Setup Wizard string refreshRussell Brenner2014-07-151-4/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | Update strings from UX flows in time for string freeze deadline. Bug: 16299032 Change-Id: I37e8ccc7197ff08d5f7eba835276c745f13e5487
* | | | Merge "Handle android.settings.HOME_SETTINGS intent" into lmp-devAmith Yamasani2014-07-153-0/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Handle android.settings.HOME_SETTINGS intentAmith Yamasani2014-07-143-0/+17
| |/ / | | | | | | | | | | | | | | | | | | Launch the Home picker activity for the new public intent. Bug: 16303152 Change-Id: I91cfffdec6c8ed13d3b0e57d7903b4a06dcbb6e6
* | | Numerous additional strings needed for translation. do not mergePauloftheWest2014-07-142-54/+346
| | | | | | | | | | | | | | | | | | Bug: 16288110 Change-Id: I84621b00da52dcee9eb8c24e92a41ccc7f7a6bd1 (cherry picked from commit 90887e656c210f2000c844334c37741e13dc02bb)
* | | Changed wording from "Mobile" to "Cellular" do not mergePauloftheWest2014-07-141-24/+24
| | | | | | | | | | | | | | | | | | Bug: 15720445 Change-Id: Ibfd196d80be030b694473faa24b746536daa3107 (cherry picked from commit 7325abcd6200d7e50674afb1b16677fd2a063597)
* | | Register the listener for switch during onResumeLifu Tang2014-07-141-2/+2
| |/ |/| | | | | | | | | - Fix b/16118646 Change-Id: I9ec87422ecc4e05ca332e116af71c07f06c6c65a
* | Revert "Add lock-to-app to settings"Jason Monk2014-07-148-391/+0
|/ | | | | | This reverts commit 315070d58b1d18fe1f5dae73e2ee09fd3ee5b13f. Change-Id: Id78311a4e0f371a87c975cc97587a404e0dfdb7f
* Remove old accounts tile, replaced by a separate screenAlexandra Gherghina2014-07-144-172/+10
| | | | | | Bug: 15815948 Bug: 15819268 Change-Id: I3b6978cff346c73cca1d6a2c209ffe4c71808244
* Merge "Don't put credentials in results from externally accessible activities"Paul Lawrence2014-07-106-16/+60
|\
| * Don't put credentials in results from externally accessible activitiesPaul Lawrence2014-07-106-16/+60
| | | | | | | | | | | | | | | | | | ConfirmLockPattern and ConfirmLockPassword return an intent that contains the password, and as such are dangerous. Create internal versions that are locked down, and don't put this info in the externally accessible versions. Bug: 13741939 Change-Id: I0df4d1e720b3c33d2c9ca086636dc54f17b19bf0
* | Small refactor, remove unused/unnecessary code, and cosmetic fixTadashi G. Takaoka2014-07-121-63/+64
| | | | | | | | Change-Id: Ia0771f547b0489d3519faf23495e5c6bdfefa42e