summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-devBrian Carlstrom2014-05-281-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 Change-Id: I5ebd13eebf42c998418ef79381d9c8b89aaf5c0c
* | | | | | | | | am 4e4cdeff: Settings: Remove sound settings.John Spurlock2014-05-2815-855/+521
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e4cdeffdb6087c953f44808f14f18554a749bda': Settings: Remove sound settings.
| * | | | | | | | Settings: Remove sound settings.John Spurlock2014-05-2815-855/+521
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the remaining conditional preferences into the combined Sound & Notifications screen. - Refactor the "Other sounds" sub-settings screen to provide a home for the new preferences. - Migrate docking sounds, conditional on config. - Migrate docking media, conditional on config. - Migrate emergency tones, conditional on CDMA. - Move all boilerplate preference <-> setting plumbing into a separate helper. - Since some preferences in Other sounds are now conditional, create a special indexer for searching. - Remove SoundSettings (and xml), create aliases in the manifest to avoid breaking shortcuts. Bug:15279526 Change-Id: I5ae3ecda2f899b1948f7908bd217a799326c2c56
* | | | | | | | Merge "Probably broke the build."Geoff Mendal2014-05-28112-2486/+4143
|\ \ \ \ \ \ \ \
| * | | | | | | | Probably broke the build.Geoff Mendal2014-05-28112-2486/+4143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit bea433fb6f8091db488aaec2a69c5c1a3212a4da. Change-Id: Ib756f35d49e16ec23e48077b1c5b63a924b0c48f
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-05-28112-4143/+2486
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-05-28112-4143/+2486
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b4d4df1a1953d6b4f1672c4d5b1ea6c0a35bb77 Auto-generated-cl: translation import
* | | | | | | Fix bug #15170508 When I initially load settings, all on/off togglesFabrice Di Meglio2014-05-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...start in off position then move to on after pane loads Another look at this issue. - start the Switch as View.GONE and make it View.VISIBLE when the Wi-Fi state is defined. Change-Id: I2f3077f779fc4030b2ba9ff3b21be8148add33c3
* | | | | | | Merge "This CL is not working (even after careful testing) but when I tried ↵Fabrice Di Meglio2014-05-2817-101/+90
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | I was not completely ToT. "
| * | | | | | | This CL is not working (even after careful testing) but when I tried I was ↵Fabrice Di Meglio2014-05-2817-101/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not completely ToT. Revert "Fix bug #15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads" This reverts commit 1e52db8063a0be2254097b4d85527a91d141b505. Change-Id: I73bdfeba4a4b3e993e37cdae1e3733ffe272b9eb
* | | | | | | | Merge "Make TTS "Listen to an example" survive rotation."Przemyslaw Szczepaniak2014-05-281-0/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Make TTS "Listen to an example" survive rotation.Przemyslaw Szczepaniak2014-05-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15019145 Change-Id: Id94e32947c58911ded3e4025653b415453cabbbb
* | | | | | | | Merge "Fix bug #15170508 When I initially load settings, all on/off toggles ↵Fabrice Di Meglio2014-05-2817-90/+101
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | start in off position then move to on after pane loads"
| * | | | | | Fix bug #15170508 When I initially load settings, all on/off toggles start ↵Fabrice Di Meglio2014-05-2717-90/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in off position then move to on after pane loads - refactor all the code that was using the Switch to control it thru the SwitchBar - start the Switch as View.GONE and make it View.VISIBLE when it is set as "enabled" or "checked" so that you dont see the Switch transition (it shows only with it final state) Change-Id: I382076bf3c819c530b5b2c06ca2429dfb2cdc6bf
* | | | | | | am 9e8bd809: Merge "Move mobile data dis/enable to Telephony" into ↵Dave Langemak2014-05-270-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-preview-dev * commit '9e8bd809fca7c5fccc02bb5671c78e60906bd12a': Move mobile data dis/enable to Telephony
| * | | | | | Merge "Move mobile data dis/enable to Telephony" into lmp-preview-devDave Langemak2014-05-272-9/+7
| |\ \ \ \ \ \
| | * | | | | | Move mobile data dis/enable to TelephonyRobert Greenwalt2014-05-272-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConnectivityService doesn't do this anymore. bug:15077247 Change-Id: I3208c91b2c0369b594987f39ca29da7478435513 (cherry picked from commit 0d4c500e98f7499db524c8073e2c8e9dfaa1febb)
* | | | | | | | am 9c3c57f7: (-s ours) DO NOT MERGE: Fix bug #15161058 Stability: ISE in ↵Fabrice Di Meglio2014-05-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings:Fragment DashboardSummary{588de71} not attached to Activity * commit '9c3c57f7aeced1dad6f7aca5552d01f696f8ea26': DO NOT MERGE: Fix bug #15161058 Stability: ISE in Settings:Fragment DashboardSummary{588de71} not attached to Activity
| * | | | | | | DO NOT MERGE: Fix bug #15161058 Stability: ISE in Settings:Fragment ↵Fabrice Di Meglio2014-05-271-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DashboardSummary{588de71} not attached to Activity - prevent rebuilding the UI until the fragment got attached Change-Id: I6d5fcbce2581f3fc9900f1ca4fc8178ee959061e (cherry picked from commit 53d76860a53c1463d182d4f3d28ce8e9f48454f3)
* | | | | | | | am 42c4b0ab: (-s ours) DO NOT MERGE: Optimize Dashboard loadingFabrice Di Meglio2014-05-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '42c4b0abe5578a7812844ad5205ffc3b87cf3072': DO NOT MERGE: Optimize Dashboard loading
| * | | | | | | DO NOT MERGE: Optimize Dashboard loadingFabrice Di Meglio2014-05-272-10/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - prevent loading categories twice - add some logging to see the time taken for building the Dashboard titles Change-Id: I31724c0e66fe3b453a87f12476f58db84c73423f (cherry picked from commit b644f29313c086806d1ba5ad3db8ac36d2bf3c4f)
* | | | | | | am 66548844: Merge "Settings: Hide phone-related settings on tablets." into ↵John Spurlock2014-05-275-49/+132
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-preview-dev * commit '665488441761a0d6cae2498eff935de31a1a7f9f': Settings: Hide phone-related settings on tablets.
| * | | | | | Merge "Settings: Hide phone-related settings on tablets." into lmp-preview-devJohn Spurlock2014-05-275-49/+132
| |\ \ \ \ \ \
| | * | | | | | Settings: Hide phone-related settings on tablets.John Spurlock2014-05-275-49/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:15002393 Bug:15091008 Change-Id: I8238b7990572f46e1530a800897ab2d39a189055
* | | | | | | | Merge "You broke the build. off you go."Baligh Uddin2014-05-27112-2294/+4087
|\ \ \ \ \ \ \ \
| * | | | | | | | You broke the build. off you go.Baligh Uddin2014-05-27112-2294/+4087
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit 416d11b4a9e3bdbdfecc27eb193b58c209a1d8e8. Change-Id: I58f2611d81652317590c2d59737ae6acec435f50
* | | | | | | | | am 85315533: Settings: Performance tweaks for SeekBarVolumizer.John Spurlock2014-05-272-4/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | * commit '85315533a19aa61a0c5fc27d3f783c3f21e3878f': Settings: Performance tweaks for SeekBarVolumizer.
| * | | | | | | Settings: Performance tweaks for SeekBarVolumizer.John Spurlock2014-05-272-4/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bind to existing volumizer instance when possible. Bug:15091992 Change-Id: I26248967ff85fdb7a850451336d6850e508d4f18
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-05-26112-4087/+2294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I05a100b276a03069630751b1edeac5701ea1d02d Auto-generated-cl: translation import
* | | | | | | am 85ba0ee6: Fix crash when launching zen mode settings.John Spurlock2014-05-241-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | * commit '85ba0ee6ec978b760720f1ece3e8e64e0340d260': Fix crash when launching zen mode settings.
| * | | | | Fix crash when launching zen mode settings.John Spurlock2014-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The switch bar is only accessible in onActivityCreated. Defer initialization until then. Bug:15214851 Change-Id: Ie026d46250dae397ba0af02e833bb178631fe708
* | | | | | am 7ca0cd41: Merge "Make smooth transition between Search fragment and the ↵Fabrice Di Meglio2014-05-241-4/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | others" into lmp-preview-dev * commit '7ca0cd415c4d5069e4981a6d5e41e8aa9a43f23e': Make smooth transition between Search fragment and the others
| * | | | | Merge "Make smooth transition between Search fragment and the others" into ↵Fabrice Di Meglio2014-05-241-4/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-preview-dev
| | * | | | | Make smooth transition between Search fragment and the othersFabrice Di Meglio2014-05-231-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use TransitionManager.beginDelayedTransition() and getFragmentManager().executePendingTransactions() Change-Id: I5d583916afb8b87dfe2b17b4e685ef5384c5fbd2
* | | | | | | Add Indexing and Search for ChooseLockGenericFragmentFabrice Di Meglio2014-05-233-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - clean some imports - add key and title to security_settings_picker.xml - add ChooseLockGenericFragment in SearchIndexableResources Change-Id: I867a1e11905cc4059d6eccabeab04d55cc3d799e
* | | | | | | am 0171fdba: Merge "Fix issue #15185822: Stability: ArithmeticException: ↵Dianne Hackborn2014-05-245-5/+55
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | divide by zero" into lmp-preview-dev * commit '0171fdba7bd9b5acdcf0d32ffa12e07c69045a5d': Fix issue #15185822: Stability: ArithmeticException: divide by zero
| * | | | | | Merge "Fix issue #15185822: Stability: ArithmeticException: divide by zero" ↵Dianne Hackborn2014-05-235-5/+55
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into lmp-preview-dev
| | * | | | | Fix issue #15185822: Stability: ArithmeticException: divide by zeroDianne Hackborn2014-05-235-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also small visual improvements. Change-Id: I55dc30539a4ef67e9261f338c8c5a729a6958d9b
* | | | | | | am 7e4855e8: Update Search recents behaviorFabrice Di Meglio2014-05-232-30/+31
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7e4855e8f644bdecf68ec65b8c1b7c08624a4876': Update Search recents behavior
| * | | | | | Update Search recents behaviorFabrice Di Meglio2014-05-232-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - per UX request - Search recents show now by defaults with the recent searches when the SearchView is empty - when we press on a Serach recent, we are showing the Search results and the recents are disappearing - when keying text in the SearchView, we hide the recents and start showing the results - we still save the Search query when hitting on a result Change-Id: I6c2be21660a30f6973dea27d4852b2068a05963d
* | | | | | | am 2416a3e0: Seventh batch of new Quantum Theme assetsFabrice Di Meglio2014-05-235-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2416a3e071785241c15463b20d1d34001ba931af': Seventh batch of new Quantum Theme assets
| * | | | | | Seventh batch of new Quantum Theme assetsFabrice Di Meglio2014-05-235-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - needed for Quantum Theme support See bug #13140648 Settings needs to support the new Quantum Paper theme Change-Id: I93b060d016620a304f2e34cee498f9e2357a6cb6
* | | | | | | am 5370e2e7: (-s ours) Merge "Sixth batch of new Quantum Theme assets - DO ↵Fabrice Di Meglio2014-05-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-preview-dev * commit '5370e2e7755082997d6811cba325941ead46518d': Sixth batch of new Quantum Theme assets - DO NOT MERGE
| * | | | | | Merge "Sixth batch of new Quantum Theme assets - DO NOT MERGE" into ↵Fabrice Di Meglio2014-05-2322-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-preview-dev
| | * | | | | | Sixth batch of new Quantum Theme assets - DO NOT MERGEFabrice Di Meglio2014-05-2322-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - needed for Quantum Theme support See bug #13140648 Settings needs to support the new Quantum Paper theme Change-Id: Iaec517aa448b1590bcb355ac8694b2e4e0c90292 (cherry picked from commit 58473734485d2eb17e71b5a63a1be7f7e09ce651)
* | | | | | | | am 52ed90b3: (-s ours) Fifth batch of new Quantum Theme assets - DO NOT MERGEFabrice Di Meglio2014-05-230-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '52ed90b31184dc68cfac0edeeae5ba18aa2eea94': Fifth batch of new Quantum Theme assets - DO NOT MERGE
| * | | | | | | Fifth batch of new Quantum Theme assets - DO NOT MERGEFabrice Di Meglio2014-05-23160-0/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - needed for Quantum Theme support See bug #13140648 Settings needs to support the new Quantum Paper theme Change-Id: I04e31e277d59d97f7871dde6bdb6a7099c7a8d65 (cherry picked from commit dcfa52c524591370e8a3b7f237e7a475a234b21c)
* | | | | | | am 058df7d0: (-s ours) Merge "Fix bug #15173703 Crash in Settings is ↵Fabrice Di Meglio2014-05-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | observed when Android Beam page orientation is changed. DO NOT MERGE" into lmp-preview-dev * commit '058df7d01fa592b8b0068db9a7770a7eaf3f46f0': Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE
| * | | | | | Merge "Fix bug #15173703 Crash in Settings is observed when Android Beam ↵Fabrice Di Meglio2014-05-231-10/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | page orientation is changed. DO NOT MERGE" into lmp-preview-dev
generated by cgit v1.1 at 2024-12-26 17:54:27 +0000