summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge "New assets (wifi, bluetooth...)" into gingerbreadGilles Debunne2010-09-2922-0/+0
| |\ \
| | * | New assets (wifi, bluetooth...)Gilles Debunne2010-09-2922-0/+0
| | | | | | | | | | | | | | | | Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
* | | | am 5698a75f: Split strings with SD card references into variations.Eric Fischer2010-09-291-41/+116
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '5698a75f15526a38ee8e0b647d05e4ee358c575a' into gingerbread-plus-aosp * commit '5698a75f15526a38ee8e0b647d05e4ee358c575a': Split strings with SD card references into variations.
| * | | Split strings with SD card references into variations.Eric Fischer2010-09-291-41/+116
| | | | | | | | | | | | | | | | Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
* | | | am d2c3f37f: Revise the Language & keyboard settings layout.Ken Wakasa2010-09-2922-76/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp * commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025': Revise the Language & keyboard settings layout.
| * | | Revise the Language & keyboard settings layout.Ken Wakasa2010-09-2922-76/+17
| | | | | | | | | | | | | | | | | | | | bug: 2954950 Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
* | | | am 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbreadNick Pelly2010-09-282-0/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp * commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4': Add NFC checkbox to Settings app.
| * | | Merge "Add NFC checkbox to Settings app." into gingerbreadNick Pelly2010-09-282-0/+12
| |\ \ \ | | |/ / | |/| |
| | * | Add NFC checkbox to Settings app.Nick Pelly2010-09-282-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Heavily modified to remove dead code. Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
* | | | am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbreadChris Palmer2010-09-281-37/+61
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '88fdee27e97900173be2b1f4f86c25a7c381969c' into gingerbread-plus-aosp * commit '88fdee27e97900173be2b1f4f86c25a7c381969c': Improve the add-device-admin layout.
| * | | Improve the add-device-admin layout.Chris Palmer2010-09-281-37/+61
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it so that the app's explanation comes before the list of possible policies. This gives the app a chance to explain itself instead of having the explanation hidden below the fold. To avoid situations in which one bunch of text items can obscure the other, use an expandable/ellipsizable TextView with an indicator image. This resolves b/2992594. Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
* | | am 54e21852: Merge "Trim unwanted whitespace from translations. DO NOT ↵Eric Fischer2010-09-278-19/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | MERGE" into gingerbread Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp * commit '54e21852f221c183eba12e1706650cdc7e0a395f': Trim unwanted whitespace from translations. DO NOT MERGE
| * | Trim unwanted whitespace from translations. DO NOT MERGEEric Fischer2010-09-278-19/+19
| | | | | | | | | | | | Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7
* | | am b2fa8719: Import revised translations. DO NOT MERGEEric Fischer2010-09-2420-85/+85
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp * commit 'b2fa8719a483a3ab36a8d919641714551c470bb8': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2010-09-2420-85/+85
| | | | | | | | | | | | Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
* | | am 28580b4d: Remove Search from the system Settings app DO NOT MERGEBjorn Bringert2010-09-213-15/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp * commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9': Remove Search from the system Settings app DO NOT MERGE
| * | Remove Search from the system Settings app DO NOT MERGEBjorn Bringert2010-09-213-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search settings acitivity lives in the system search app, which is build-dependent. Also, since the Browser no longer looks at the SHOW_WEB_SUGGESTIONS system preference, none of the search settings affect the behavior of any other platform apps. The search settings will henceforth only be available from within the search app (e.g. QuickSearchBox). This is a cherry-pick of change I08f3979cd8cdc0742efbc49be95aa59753c94c0d to gingerbread. Bug: 3017365 Change-Id: I55df30e3a0e1f307ad6f23900f54d3018efda59f
* | | am cb818619: Update power usage UI to follow WIFI data changes.Dianne Hackborn2010-09-171-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'cb818619c669d4257a4df969dd03eff479ba84d0' into gingerbread-plus-aosp * commit 'cb818619c669d4257a4df969dd03eff479ba84d0': Update power usage UI to follow WIFI data changes.
| * | Update power usage UI to follow WIFI data changes.Dianne Hackborn2010-09-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Now handles WIFI start times being distributed across applications, and collapses all work done in WIFI uid procs (esp that supplicant thing) into the apps and overall WIFI category. Change-Id: I341e5d63c45eeb0fb4121beed62474d947f9de11
* | | am 33319b12: Bluetooth PIN is not password styleErik Ljungberg2010-09-101-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '33319b1228d8af25797e1371b088fc8491349c21' into gingerbread-plus-aosp * commit '33319b1228d8af25797e1371b088fc8491349c21': Bluetooth PIN is not password style
| * | Bluetooth PIN is not password styleErik Ljungberg2010-09-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bluetooth PIN is changed to password style to comform with how passwords are normally shown in the UI. Change-Id: I293e94cf3766f9b5b82b9bb89e5aed4bd494ef71
| * | am 4e012037: Import revised translationsKenny Root2010-06-211-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4e01203746710646227470390d4a9f7fb52c6238' into froyo-plus-aosp * commit '4e01203746710646227470390d4a9f7fb52c6238': Import revised translations
| | * | Import revised translationsKenny Root2010-06-211-5/+5
| | | | | | | | | | | | | | | | Change-Id: I170f4347b73055ce204d75cfa1bef5cc22b928b1
| * | | am db751db4: Import revised translationsKenny Root2010-06-2123-69/+149
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'db751db4c919ea4ab981d52017b9741d386dad19' into froyo-plus-aosp * commit 'db751db4c919ea4ab981d52017b9741d386dad19': Import revised translations
| | * | Import revised translationsKenny Root2010-06-2023-69/+149
| | | | | | | | | | | | | | | | Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
* | | | am be45f642: Import revised translations. DO NOT MERGEEric Fischer2010-09-1020-528/+328
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit 'be45f642cafdd27e5ffeb79b13aa3e33a83ae823' into gingerbread-plus-aosp * commit 'be45f642cafdd27e5ffeb79b13aa3e33a83ae823': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2010-09-1020-528/+328
| | | | | | | | | | | | | | | | Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
* | | | am 1a886f80: Merge "Preserve old translations for changed strings. DO NOT ↵Eric Fischer2010-09-0720-240/+120
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into gingerbread Merge commit '1a886f805be579ed2f32c861870e35aba37111bd' into gingerbread-plus-aosp * commit '1a886f805be579ed2f32c861870e35aba37111bd': Preserve old translations for changed strings. DO NOT MERGE
| * | | Merge "Preserve old translations for changed strings. DO NOT MERGE" into ↵Eric Fischer2010-09-0720-240/+120
| |\ \ \ | | | | | | | | | | | | | | | gingerbread
| | * | | Preserve old translations for changed strings. DO NOT MERGEEric Fischer2010-09-0320-240/+120
| | | | | | | | | | | | | | | | | | | | Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
* | | | | am 02930093: Fix issue #2905454: Crash observed while accessing Battery ↵Dianne Hackborn2010-09-022-9/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history page on passion/GRG40 Merge commit '0293009389eb3a4e8a3f2d08060e864f53f3c532' into gingerbread-plus-aosp * commit '0293009389eb3a4e8a3f2d08060e864f53f3c532': Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
| * | | | Fix issue #2905454: Crash observed while accessing Battery history page on ↵Dianne Hackborn2010-09-022-9/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | passion/GRG40 Change-Id: Ifd08744d909c2d87e5cdf4eedcc5af1a86548e60
* | | | am 92669a51: Import revised translations. DO NOT MERGEEric Fischer2010-08-3020-121/+141
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '92669a512a80fb99b71cbdf22aca9d91ae006b01' into gingerbread-plus-aosp * commit '92669a512a80fb99b71cbdf22aca9d91ae006b01': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2010-08-2720-121/+141
| | | | | | | | | | | | | | | | Change-Id: I258c6a8b900eae6e101ad910b9414e5ba857246d
* | | | am a457719c: Add new string for the notification to be displayed when the ↵Jean-Michel Trivi2010-08-251-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | user installs a new TTS engine. Merge commit 'a457719c5042f944540f76c03b5e61ecd0ffae39' into gingerbread-plus-aosp * commit 'a457719c5042f944540f76c03b5e61ecd0ffae39': Add new string for the notification to be displayed when the user
| * | | Add new string for the notification to be displayed when the userJean-Michel Trivi2010-08-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | installs a new TTS engine. Change-Id: If370cc40b0da858ec838711190d6b660b1c34ebf
* | | | am e55b0e2e: Fix issue #2895310: Please fix problems with your stringsDianne Hackborn2010-08-201-12/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'e55b0e2e88adc2be5958d0ae4ea310997aa2002f' into gingerbread-plus-aosp * commit 'e55b0e2e88adc2be5958d0ae4ea310997aa2002f': Fix issue #2895310: Please fix problems with your strings
| * | | Fix issue #2895310: Please fix problems with your stringsDianne Hackborn2010-08-201-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Make up some numbers. Change-Id: Ib3d1018282efd4979be8ef22384c9d64e67456e4
* | | | am a712c3b7: A couple small settings fixes:Dianne Hackborn2010-08-181-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp * commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a': A couple small settings fixes:
| * | | A couple small settings fixes:Dianne Hackborn2010-08-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Correctly position WIFI/GPS charts. - Start out with running services hidden in case we need to show the progress bar. Change-Id: I8852f334f68f4e9122b5d688d9fd57d0f94d94d8
* | | | am f8a91b53: Import revised translations. DO NOT MERGEEric Fischer2010-08-1820-2/+122
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'f8a91b535b05619061dad5870db2318b012bbc0b' into gingerbread-plus-aosp * commit 'f8a91b535b05619061dad5870db2318b012bbc0b': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2010-08-1720-2/+122
| | | | | | | | | | | | | | | | Change-Id: If954fbc7c9ff4898e76e6e4dcde4f9dffdd7cbf2
* | | | am ff3673c7: Make running services initial update async.Dianne Hackborn2010-08-151-0/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'ff3673c7f477b1d78e64a8bc28754552dcdc8826' into gingerbread-plus-aosp * commit 'ff3673c7f477b1d78e64a8bc28754552dcdc8826': Make running services initial update async.
| * | | Make running services initial update async.Dianne Hackborn2010-08-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Also fix the value show for an app's awake time. Change-Id: I801681d3a1d47a6bb1f3fb8cc5b0ef009201146f
* | | | am be5994d2: Some improvements to the battery usage UI:Dianne Hackborn2010-08-131-4/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'be5994d20152c7194aac79eb8152240655fd3373' into gingerbread-plus-aosp * commit 'be5994d20152c7194aac79eb8152240655fd3373': Some improvements to the battery usage UI:
| * | | Some improvements to the battery usage UI:Dianne Hackborn2010-08-131-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show wake lock usage in the battery history. - Show WIFI usage in the battery history. - Show the amount an app has held a wake lock in the app details. - Also fix service run time computation in running services. Change-Id: I5aa959857f83808fbc709f65204f59bbfb73935b
* | | | am 38f15782: Import revised translations. DO NOT MERGEEric Fischer2010-08-106-17/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '38f157820750b90434208ef66330dcab52882ede' into gingerbread-plus-aosp * commit '38f157820750b90434208ef66330dcab52882ede': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2010-08-106-17/+17
| | | | | | | | | | | | | | | | Change-Id: Iecf4053f74ab4c38b165291feef5211ce4cfc83e
* | | | am 4d9d75a4: Import revised translations. DO NOT MERGEEric Fischer2010-08-0441-2804/+2893
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '4d9d75a42471ca65670fd2adc80d37bca43a69f6' into gingerbread-plus-aosp * commit '4d9d75a42471ca65670fd2adc80d37bca43a69f6': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2010-08-0441-2804/+2893
| | | | | | | | | | | | | | | | Change-Id: Ic83849d97650cec0560d847a962756c53d65ea78
generated by cgit v1.1 at 2025-01-20 09:29:37 +0000