summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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 66548844: Merge "Settings: Hide phone-related settings on tablets." into ↵John Spurlock2014-05-273-27/+98
|\ \ | | | | | | | | | | | | | | | | | | 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-273-27/+98
| |\ \
| | * | Settings: Hide phone-related settings on tablets.John Spurlock2014-05-273-27/+98
| | | | | | | | | | | | | | | | | | | | | | | | Bug:15002393 Bug:15091008 Change-Id: I8238b7990572f46e1530a800897ab2d39a189055
* | | | 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
* | / 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-232-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | - 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-242-4/+33
|\| | | | | | | | | | | | | | | | | | | | 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-232-4/+33
| |\ \ | | |/ | |/| | | | into lmp-preview-dev
| | * Fix issue #15185822: Stability: ArithmeticException: divide by zeroDianne Hackborn2014-05-232-4/+33
| | | | | | | | | | | | | | | | | | 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
| * | Sixth batch of new Quantum Theme assets - DO NOT MERGEFabrice Di Meglio2014-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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)
| * | Fix bug #15173703 Crash in Settings is observed when Android Beam page ↵Fabrice Di Meglio2014-05-231-10/+28
| |/ | | | | | | | | | | | | | | | | orientation is changed. DO NOT MERGE - use onActivityCreated() / onResume() / onPause() for the SwitchBar Change-Id: I24b346fdc5c19acedbe845d3b7697718412b5e5d (cherry picked from commit 4c42a88828a8df9e00ce66216fe0ef9f0d89464d)
* | Merge "Fix bug #15173703 Crash in Settings is observed when Android Beam ↵Fabrice Di Meglio2014-05-231-10/+28
|\ \ | | | | | | | | | page orientation is changed."
| * | Fix bug #15173703 Crash in Settings is observed when Android Beam page ↵Fabrice Di Meglio2014-05-221-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | orientation is changed. - use onActivityCreated() / onResume() / onPause() for the SwitchBar Change-Id: I24b346fdc5c19acedbe845d3b7697718412b5e5d
* | | Merge "Sixth batch of new Quantum Theme assets"Fabrice Di Meglio2014-05-231-1/+1
|\| |
| * | Sixth batch of new Quantum Theme assetsFabrice Di Meglio2014-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - needed for Quantum Theme support See bug #13140648 Settings needs to support the new Quantum Paper theme Change-Id: Iaec517aa448b1590bcb355ac8694b2e4e0c90292
* | | when vervbose logging, keep track of a list of ScanResults per APvandwalle2014-05-222-11/+101
| | | | | | | | | | | | Change-Id: Ib8f797de360f11eb9914a6aa44d418e1d0571973
* | | Merge "Fix bug #15161058 Stability: ISE in Settings:Fragment ↵Fabrice Di Meglio2014-05-221-7/+12
|\| | | | | | | | | | | DashboardSummary{588de71} not attached to Activity"
| * | Fix bug #15161058 Stability: ISE in Settings:Fragment ↵Fabrice Di Meglio2014-05-221-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | DashboardSummary{588de71} not attached to Activity - prevent rebuilding the UI until the fragment got attached Change-Id: I6d5fcbce2581f3fc9900f1ca4fc8178ee959061e
* | | Merge "Add Editable PAC field to Proxy Configuration"Jason Monk2014-05-221-15/+47
|\ \ \
| * | | Add Editable PAC field to Proxy ConfigurationJason Monk2014-05-221-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make PAC URL field not read only but now settable in advanced wifi configuration options. Bug: 14885470 Change-Id: I2c647f823d5c8a75b5fbf74434cbf0efcc4c50bf
* | | | Merge "Optimize Dashboard loading"Fabrice Di Meglio2014-05-222-10/+11
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Optimize Dashboard loadingFabrice Di Meglio2014-05-222-10/+11
| | | | | | | | | | | | | | | | | | | | | - prevent loading categories twice - add some logging to see the time taken for building the Dashboard titles Change-Id: I31724c0e66fe3b453a87f12476f58db84c73423f
* | | Merge "Move mobile data dis/enable to Telephony"Robert Greenwalt2014-05-222-9/+7
|\ \ \ | |_|/ |/| |
| * | Move mobile data dis/enable to TelephonyRobert Greenwalt2014-05-212-9/+7
| | | | | | | | | | | | | | | | | | | | | ConnectivityService doesn't do this anymore. bug:15077247 Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
* | | Merge "make verbose logging a wifimanager hidden API"vandwalle2014-05-223-15/+77
|\ \ \ | |/ / |/| |
| * | make verbose logging a wifimanager hidden APIvandwalle2014-05-213-15/+77
| | | | | | | | | | | | Change-Id: I092b7f507ad4dfdab16658929f02584a1fc22ba4
* | | Merge "Improve Preference highlighting for Search"Fabrice Di Meglio2014-05-212-5/+19
|\ \ \ | |/ / |/| / | |/
| * Improve Preference highlighting for SearchFabrice Di Meglio2014-05-212-5/+19
| | | | | | | | | | | | | | - cache hightlight Drawable - set mPreferenceHighlighted as early as possible Change-Id: I512d4677e94309175ead22c46b7a78e2aa387e1c
* | Merge "Fix HighlightingFragment"Fabrice Di Meglio2014-05-211-1/+1
|\|
| * Fix HighlightingFragmentFabrice Di Meglio2014-05-211-1/+1
| | | | | | | | | | | | | | | | - get themed highlight drawable Similar fix as I945eca98e1d73fda3b290a6ababfd1fb41118d8f Change-Id: Ieabee16433ec29044a7a26875c3325231a287c88
* | Merge "Update battery use chart to better match new mocks."Dianne Hackborn2014-05-213-155/+538
|\ \
| * | Update battery use chart to better match new mocks.Dianne Hackborn2014-05-213-155/+538
| | | | | | | | | | | | Change-Id: I714cb30ccd9b8144785aee16a23ae2b723df4347
* | | Merge "Fix bug #15115542 Ripple effect is crashing Settings with ↵Fabrice Di Meglio2014-05-211-1/+1
|\ \ \ | |/ / |/| / | |/ java.lang.NullPointerException"
| * Fix bug #15115542 Ripple effect is crashing Settings with ↵Fabrice Di Meglio2014-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | java.lang.NullPointerException - for having the tint attribute to be populated you need to have the Theme passed. This is why Fragment.getActivity().getDrawable(...) should be used instead of Fragment.getResources().getDrawable(...) Change-Id: I945eca98e1d73fda3b290a6ababfd1fb41118d8f
* | Update NotificationListenerService APIChristoph Studer2014-05-211-4/+0
|/ | | | Change-Id: I09089bf5063031c08e67a5e63e2997f8df727bfd
* Merge "Fix master: deleting remaining file from revert."Andres Morales2014-05-211-161/+0
|\
| * Fix master: deleting remaining file from revert.Andres Morales2014-05-201-161/+0
| | | | | | | | Change-Id: I9aab25b8a7135bbc59556bc30d538a7c450de060
* | Merge "Revert "Settings for NFC Unlock""Andres Morales2014-05-202-146/+0
|\ \
| * | Revert "Settings for NFC Unlock"Andres Morales2014-05-202-146/+0
| | | | | | | | | | | | | | | | | | | | | | | | This will be rolled into a Trustlet This reverts commit fd2b6293358bda6f6beaab088e8913a13c0e2e31. Change-Id: I921f0838d4646799b6664da64a578a209e9c037e
* | | Merge "Fix bug #14494292 Settings>Search>Recent searches keep on populating ↵Fabrice Di Meglio2014-05-201-1/+8
|\ \ \ | | | | | | | | | | | | the same keyword if it is searched again"
| * | | Fix bug #14494292 Settings>Search>Recent searches keep on populating the ↵Fabrice Di Meglio2014-05-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same keyword if it is searched again - do the right thing: remove the previous search queries from the Database if needed so that there will be no dupe Change-Id: I707eb518ea7c2a64b1407c62ff164e249fe03fa9