summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of ↵Elliott Hughes2012-09-0652-104/+4
|\ | | | | | | | | | | | | 33f86196 to stage-aosp-master * commit '105d879ccef2517a07a15f29b956be739504fa73': Stop hard-coding sample 12- and 24-hour times.
| * am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to ↵Elliott Hughes2012-09-0652-104/+4
| |\ | | | | | | | | | | | | | | | | | | stage-aosp-master * commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9': Stop hard-coding sample 12- and 24-hour times.
| | * am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-masterElliott Hughes2012-09-0652-104/+4
| | |\ | | | | | | | | | | | | | | | | * commit '680c8c8e43804d9bf69568d4748b3bd3a4aea0ee': Stop hard-coding sample 12- and 24-hour times.
| | | * resolved conflicts for merge of 33f86196 to stage-aosp-masterElliott Hughes2012-09-0652-104/+4
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
| | | | * Merge "Stop hard-coding sample 12- and 24-hour times."Elliott Hughes2012-09-0652-104/+4
| | | | |\
| | | | | * Stop hard-coding sample 12- and 24-hour times.Elliott Hughes2012-09-0652-104/+4
| | | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 6881640 Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
* | | | | am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-devBaligh Uddin2012-09-0698-1286/+1332
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd4e216bc9eb9b8aecd031a5f3c2a412857333a99': Revert "Import translations. DO NOT MERGE"
| * | | | Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-devBaligh Uddin2012-09-0698-1286/+1332
| |\ \ \ \
| | * | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-0698-1286/+1332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke the build. This reverts commit 9dcb0727d0d7be183d615d7bdfb6836d2017966a Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
* | | | | | am d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-0698-1332/+1286
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd2dec8c70eb8f745425c09070069ef52d306b233': Import translations. DO NOT MERGE
| * | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-0698-1332/+1286
| |\ \ \ \ \ | | |/ / / /
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-0598-1332/+1286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822 Auto-generated-cl: translation import
* | | | | | am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '710aeba1ce0bf2d121aaaf659284074750b43c6e':
| * | | | | am c53ce268: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | * commit 'c53ce26836eccfe9c0bb315d965bc73a9bd7b214':
| | * | | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de
| | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
* | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9619964e59d6d3f9036372e67278498472f1d290
| * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-040-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-300-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | |\ \ \ \ \ \
* | | | | | | | | \ \ \ \ \ \ am ee04e472: Merge "Add content descriptions to power control widget." into ↵Charles Chen2012-09-052-0/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'ee04e47216ca947dfc781d1b4116f252dd2aa5a4': Add content descriptions to power control widget.
| * | | | | | | | | | | | | | Merge "Add content descriptions to power control widget." into jb-mr1-devCharles Chen2012-09-052-0/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add content descriptions to power control widget.alanv2012-08-302-0/+77
| | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6361285 Change-Id: I4fd7ed519de9a5b7e50e6905550695fad02bcc42
* | | | | | | | | | | | | | am 1537e8b3: Dream settings: list items back to constant heightJohn Spurlock2012-09-054-79/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1537e8b3e8d81bf404f6aa70c8ca514f3ff62dd5': Dream settings: list items back to constant height
| * | | | | | | | | | | | | Dream settings: list items back to constant heightJohn Spurlock2012-09-054-79/+92
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expanding/collapsing items removed, settings icon shown on right with divider if applicable. New "Start" action on the action bar to start dreaming. This is no longer in preview/test mode, but a call to .dream(). Bug: 7010260 Change-Id: Ia1d8b9a70218dcc598bf62befbf545f572bbc6b1
* | | | | | | | | | | | | am 952146ee: Merge "Clear profile connnection status of bonded devices when ↵Matthew Xie2012-09-042-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BT is turned off" into jb-mr1-dev * commit '952146ee8f13ea87a890e3e4f7726fe49b60fc3d': Clear profile connnection status of bonded devices when BT is turned off
| * | | | | | | | | | | | Merge "Clear profile connnection status of bonded devices when BT is turned ↵Matthew Xie2012-09-042-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | off" into jb-mr1-dev
| | * | | | | | | | | | | Clear profile connnection status of bonded devices when BT is turned offGanesh Ganapathi Batta2012-09-042-0/+20
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When BT is turned off in mid of a profile connection, sometimes profile connection status change message with status= DISCONNECTED does not reach Settings app which results in stale connection status for the device when BT is enabled next time. Fixed the issue By explicitly clearing the connection status for all paired devices when BT is turning OFF Change-Id: I5d0c158636f3b62eff9094821abe2ef3a7cab16e
* | | | | | | | | | | | am 22dc1fe2: Make TTS languages list sorted.Przemyslaw Szczepaniak2012-09-031-9/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '22dc1fe2bae886b385ddc22ee4f2819e5764c71a': Make TTS languages list sorted.
| * | | | | | | | | | | Make TTS languages list sorted.Przemyslaw Szczepaniak2012-09-031-9/+32
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also makes sure that languages list always have underlying array after onCreate. Bug: 5640782 Change-Id: Id85d0099efccc9a64458d24853b5c98a35307b38
* | | | | | | | | | | am c888555f: FIX BUILD (DO NOT MERGE)Mathias Agopian2012-08-3198-1330/+716
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c888555f8907328a8625cb2301e081fcd143f2c5': FIX BUILD (DO NOT MERGE)
| * | | | | | | | | | FIX BUILD (DO NOT MERGE)Mathias Agopian2012-08-3198-1330/+716
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit b3e78cc41f16b0227a5fd31431c95f911c268567. Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
* | | | | | | | | | | am f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-3098-716/+1330
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9e25e833f3bed04ebdb6481176584dfe3691088': Import translations. DO NOT MERGE
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-3098-716/+1330
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2998-716/+1330
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie33abb2dac44b49a64040688f9ffe7a1d7add9f3 Auto-generated-cl: translation import
* | | | | | | | | | | am 788cde4c: Rename settings title for user management screenAmith Yamasani2012-08-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '788cde4ce41ec633056c9c2b1360826ad72cda40': Rename settings title for user management screen
| * | | | | | | | | | Rename settings title for user management screenAmith Yamasani2012-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a57d52eb0c4e4fb8a8ab1449b98751927da2519
* | | | | | | | | | | am 037df2cb: Merge "Surface storage usage of other users." into jb-mr1-devJeff Sharkey2012-08-306-178/+307
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '037df2cb182edb3070080625031073d30abfc56a': Surface storage usage of other users.
| * | | | | | | | | | Merge "Surface storage usage of other users." into jb-mr1-devJeff Sharkey2012-08-306-178/+307
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Surface storage usage of other users.Jeff Sharkey2012-08-306-178/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring up separate StorageMeasurement sessions bound to other users on device, and surface their total usage as teal colors. Exclude app code size when measuring secondary users. Shift preferences to using keys instead of fragile index ordering. Bug: 7003520 Change-Id: I214d0b223e53955df71104502596743f049f2027
* | | | | | | | | | | | am 7af2aa52: More traditional list item style for dreams settings.John Spurlock2012-08-3011-90/+144
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7af2aa52ac2e458969abeaefec217f6a4f976767': More traditional list item style for dreams settings.
| * | | | | | | | | | | More traditional list item style for dreams settings.John Spurlock2012-08-3011-90/+144
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other improvements: - remove "Start dreaming now", promote "When to dream" to action bar - added logging - hide dream settings button if n/a - new flat style for settings/preview + dividers - refresh dreams list when packages are installed/uninstalled - added placeholder for help url Bug:7010260 Change-Id: Ia443b4f76678eaf1a52b907d50aefb0d8f7e4748
* | | | | | | | | | | am 2dff5b10: Merge "New dream settings - first cut" into jb-mr1-devJohn Spurlock2012-08-2915-448/+578
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2dff5b109b9dd4b55cb64d89ff55c56318052b5c': New dream settings - first cut
| * | | | | | | | | | Merge "New dream settings - first cut" into jb-mr1-devJohn Spurlock2012-08-2915-448/+578
| |\ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-15 19:42:08 +0000