OSDN Git Service
Brian Carlstrom [Wed, 28 May 2014 23:18:47 +0000 (23:18 +0000)]
am
f3542909: am
2ce0dcda: am
70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
f354290901284fdf147e200c814d34207927d04e':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 23:13:26 +0000 (23:13 +0000)]
am
2ce0dcda: am
70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
2ce0dcdad47e132dbe0f9cd16146b8e3c6b11cd6':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:31:43 +0000 (22:31 +0000)]
am
70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
70f2201c7ab842df6c45a1540803239eafa267ed':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:47 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
3bc8aaad298c98eccff2060667b35fa1505f84e7)
Change-Id: I5c551d6d6f00af5a7b3638e3847950e441414e37
Brian Carlstrom [Wed, 28 May 2014 21:44:57 +0000 (21:44 +0000)]
am
238be024: Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev
* commit '
238be024d702c7a6bd702ce17617fd2a20fc1cc0':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 21:39:35 +0000 (21:39 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
Change-Id: I5ebd13eebf42c998418ef79381d9c8b89aaf5c0c
John Spurlock [Wed, 28 May 2014 20:52:56 +0000 (20:52 +0000)]
am
4e4cdeff: Settings: Remove sound settings.
* commit '
4e4cdeffdb6087c953f44808f14f18554a749bda':
Settings: Remove sound settings.
John Spurlock [Wed, 28 May 2014 13:43:45 +0000 (09:43 -0400)]
Settings: Remove sound settings.
- 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
Geoff Mendal [Wed, 28 May 2014 20:27:36 +0000 (20:27 +0000)]
Merge "Probably broke the build."
Geoff Mendal [Wed, 28 May 2014 20:23:44 +0000 (20:23 +0000)]
Probably broke the build.
Revert "Import translations. DO NOT MERGE"
This reverts commit
bea433fb6f8091db488aaec2a69c5c1a3212a4da.
Change-Id: Ib756f35d49e16ec23e48077b1c5b63a924b0c48f
Geoff Mendal [Wed, 28 May 2014 20:02:00 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 28 May 2014 19:44:19 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b4d4df1a1953d6b4f1672c4d5b1ea6c0a35bb77
Auto-generated-cl: translation import
Fabrice Di Meglio [Wed, 28 May 2014 18:43:13 +0000 (11:43 -0700)]
Fix bug #
15170508 When I initially load settings, all on/off toggles
...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
Fabrice Di Meglio [Wed, 28 May 2014 17:37:39 +0000 (17:37 +0000)]
Merge "This CL is not working (even after careful testing) but when I tried I was not completely ToT. "
Fabrice Di Meglio [Wed, 28 May 2014 17:36:21 +0000 (17:36 +0000)]
This CL is not working (even after careful testing) but when I tried I was 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
Przemyslaw Szczepaniak [Wed, 28 May 2014 16:17:36 +0000 (16:17 +0000)]
Merge "Make TTS "Listen to an example" survive rotation."
Przemyslaw Szczepaniak [Wed, 28 May 2014 10:57:07 +0000 (11:57 +0100)]
Make TTS "Listen to an example" survive rotation.
Bug:
15019145
Change-Id: Id94e32947c58911ded3e4025653b415453cabbbb
Fabrice Di Meglio [Wed, 28 May 2014 02:18:34 +0000 (02:18 +0000)]
Merge "Fix bug #
15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads"
Fabrice Di Meglio [Tue, 27 May 2014 23:43:40 +0000 (16:43 -0700)]
Fix bug #
15170508 When I initially load settings, all on/off toggles start 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
Dave Langemak [Tue, 27 May 2014 22:24:16 +0000 (22:24 +0000)]
am
9e8bd809: Merge "Move mobile data dis/enable to Telephony" into lmp-preview-dev
* commit '
9e8bd809fca7c5fccc02bb5671c78e60906bd12a':
Move mobile data dis/enable to Telephony
Fabrice Di Meglio [Tue, 27 May 2014 22:24:08 +0000 (22:24 +0000)]
am
9c3c57f7: (-s ours) DO NOT MERGE: Fix bug #
15161058 Stability: ISE in 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
Fabrice Di Meglio [Tue, 27 May 2014 22:24:07 +0000 (22:24 +0000)]
am
42c4b0ab: (-s ours) DO NOT MERGE: Optimize Dashboard loading
* commit '
42c4b0abe5578a7812844ad5205ffc3b87cf3072':
DO NOT MERGE: Optimize Dashboard loading
Dave Langemak [Tue, 27 May 2014 21:25:51 +0000 (21:25 +0000)]
Merge "Move mobile data dis/enable to Telephony" into lmp-preview-dev
Fabrice Di Meglio [Thu, 22 May 2014 18:27:43 +0000 (11:27 -0700)]
DO NOT MERGE: Fix bug #
15161058 Stability: ISE in Settings:Fragment DashboardSummary{
588de71} not attached to Activity
- prevent rebuilding the UI until the fragment got attached
Change-Id: I6d5fcbce2581f3fc9900f1ca4fc8178ee959061e
(cherry picked from commit
53d76860a53c1463d182d4f3d28ce8e9f48454f3)
Fabrice Di Meglio [Thu, 22 May 2014 17:30:03 +0000 (10:30 -0700)]
DO NOT MERGE: Optimize Dashboard loading
- 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)
Robert Greenwalt [Thu, 22 May 2014 03:02:32 +0000 (20:02 -0700)]
Move mobile data dis/enable to Telephony
ConnectivityService doesn't do this anymore.
bug:
15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit
0d4c500e98f7499db524c8073e2c8e9dfaa1febb)
John Spurlock [Tue, 27 May 2014 19:26:04 +0000 (19:26 +0000)]
am
66548844: Merge "Settings: Hide phone-related settings on tablets." into lmp-preview-dev
* commit '
665488441761a0d6cae2498eff935de31a1a7f9f':
Settings: Hide phone-related settings on tablets.
John Spurlock [Tue, 27 May 2014 19:23:24 +0000 (19:23 +0000)]
Merge "Settings: Hide phone-related settings on tablets." into lmp-preview-dev
John Spurlock [Tue, 27 May 2014 15:10:52 +0000 (11:10 -0400)]
Settings: Hide phone-related settings on tablets.
Bug:
15002393
Bug:
15091008
Change-Id: I8238b7990572f46e1530a800897ab2d39a189055
Baligh Uddin [Tue, 27 May 2014 18:32:41 +0000 (18:32 +0000)]
Merge "You broke the build. off you go."
Baligh Uddin [Tue, 27 May 2014 18:32:34 +0000 (18:32 +0000)]
You broke the build. off you go.
Revert "Import translations. DO NOT MERGE"
This reverts commit
416d11b4a9e3bdbdfecc27eb193b58c209a1d8e8.
Change-Id: I58f2611d81652317590c2d59737ae6acec435f50
John Spurlock [Tue, 27 May 2014 18:03:48 +0000 (18:03 +0000)]
am
85315533: Settings: Performance tweaks for SeekBarVolumizer.
* commit '
85315533a19aa61a0c5fc27d3f783c3f21e3878f':
Settings: Performance tweaks for SeekBarVolumizer.
John Spurlock [Tue, 27 May 2014 17:12:35 +0000 (13:12 -0400)]
Settings: Performance tweaks for SeekBarVolumizer.
Bind to existing volumizer instance when possible.
Bug:
15091992
Change-Id: I26248967ff85fdb7a850451336d6850e508d4f18
Baligh Uddin [Mon, 26 May 2014 21:46:09 +0000 (14:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05a100b276a03069630751b1edeac5701ea1d02d
Auto-generated-cl: translation import
John Spurlock [Sat, 24 May 2014 18:46:32 +0000 (18:46 +0000)]
am
85ba0ee6: Fix crash when launching zen mode settings.
* commit '
85ba0ee6ec978b760720f1ece3e8e64e0340d260':
Fix crash when launching zen mode settings.
John Spurlock [Sat, 24 May 2014 18:40:05 +0000 (14:40 -0400)]
Fix crash when launching zen mode settings.
The switch bar is only accessible in onActivityCreated. Defer
initialization until then.
Bug:
15214851
Change-Id: Ie026d46250dae397ba0af02e833bb178631fe708
Fabrice Di Meglio [Sat, 24 May 2014 01:34:11 +0000 (01:34 +0000)]
am
7ca0cd41: Merge "Make smooth transition between Search fragment and the others" into lmp-preview-dev
* commit '
7ca0cd415c4d5069e4981a6d5e41e8aa9a43f23e':
Make smooth transition between Search fragment and the others
Fabrice Di Meglio [Sat, 24 May 2014 01:31:42 +0000 (01:31 +0000)]
Merge "Make smooth transition between Search fragment and the others" into lmp-preview-dev
Fabrice Di Meglio [Sat, 24 May 2014 01:17:09 +0000 (18:17 -0700)]
Add Indexing and Search for ChooseLockGenericFragment
- clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources
Change-Id: I867a1e11905cc4059d6eccabeab04d55cc3d799e
Dianne Hackborn [Sat, 24 May 2014 00:02:05 +0000 (00:02 +0000)]
am
0171fdba: Merge "Fix issue #
15185822: Stability: ArithmeticException: divide by zero" into lmp-preview-dev
* commit '
0171fdba7bd9b5acdcf0d32ffa12e07c69045a5d':
Fix issue #
15185822: Stability: ArithmeticException: divide by zero
Dianne Hackborn [Fri, 23 May 2014 23:59:23 +0000 (23:59 +0000)]
Merge "Fix issue #
15185822: Stability: ArithmeticException: divide by zero" into lmp-preview-dev
Fabrice Di Meglio [Fri, 23 May 2014 23:48:57 +0000 (23:48 +0000)]
am
7e4855e8: Update Search recents behavior
* commit '
7e4855e8f644bdecf68ec65b8c1b7c08624a4876':
Update Search recents behavior
Dianne Hackborn [Fri, 23 May 2014 23:47:10 +0000 (16:47 -0700)]
Fix issue #
15185822: Stability: ArithmeticException: divide by zero
Also small visual improvements.
Change-Id: I55dc30539a4ef67e9261f338c8c5a729a6958d9b
Fabrice Di Meglio [Fri, 23 May 2014 23:46:50 +0000 (16:46 -0700)]
Make smooth transition between Search fragment and the others
- use TransitionManager.beginDelayedTransition() and
getFragmentManager().executePendingTransactions()
Change-Id: I5d583916afb8b87dfe2b17b4e685ef5384c5fbd2
Fabrice Di Meglio [Fri, 23 May 2014 23:03:43 +0000 (16:03 -0700)]
Update Search recents behavior
- 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
Fabrice Di Meglio [Fri, 23 May 2014 21:13:42 +0000 (21:13 +0000)]
am
2416a3e0: Seventh batch of new Quantum Theme assets
* commit '
2416a3e071785241c15463b20d1d34001ba931af':
Seventh batch of new Quantum Theme assets
Fabrice Di Meglio [Fri, 23 May 2014 21:01:34 +0000 (14:01 -0700)]
Seventh batch of new Quantum Theme assets
- needed for Quantum Theme support
See bug #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I93b060d016620a304f2e34cee498f9e2357a6cb6
Fabrice Di Meglio [Fri, 23 May 2014 20:13:51 +0000 (20:13 +0000)]
am
5370e2e7: (-s ours) Merge "Sixth batch of new Quantum Theme assets - DO NOT MERGE" into lmp-preview-dev
* commit '
5370e2e7755082997d6811cba325941ead46518d':
Sixth batch of new Quantum Theme assets - DO NOT MERGE
Fabrice Di Meglio [Fri, 23 May 2014 20:13:50 +0000 (20:13 +0000)]
am
52ed90b3: (-s ours) Fifth batch of new Quantum Theme assets - DO NOT MERGE
* commit '
52ed90b31184dc68cfac0edeeae5ba18aa2eea94':
Fifth batch of new Quantum Theme assets - DO NOT MERGE
Fabrice Di Meglio [Fri, 23 May 2014 20:13:50 +0000 (20:13 +0000)]
am
058df7d0: (-s ours) Merge "Fix bug #
15173703 Crash in Settings is 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
Fabrice Di Meglio [Fri, 23 May 2014 20:10:09 +0000 (20:10 +0000)]
Merge "Sixth batch of new Quantum Theme assets - DO NOT MERGE" into lmp-preview-dev
Fabrice Di Meglio [Fri, 23 May 2014 02:17:36 +0000 (19:17 -0700)]
Sixth batch of new Quantum Theme assets - DO NOT MERGE
- 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)
Fabrice Di Meglio [Fri, 23 May 2014 01:14:24 +0000 (18:14 -0700)]
Fifth batch of new Quantum Theme assets - DO NOT MERGE
- 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)
Fabrice Di Meglio [Fri, 23 May 2014 17:57:24 +0000 (17:57 +0000)]
Merge "Fix bug #
15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE" into lmp-preview-dev
Alan Viverette [Fri, 23 May 2014 17:36:30 +0000 (17:36 +0000)]
am
49dbbe17: Update references to private assets in Settings
* commit '
49dbbe17b8bcda9d9df53f087ed21608192a70d4':
Update references to private assets in Settings
The Android Automerger [Fri, 23 May 2014 17:36:30 +0000 (17:36 +0000)]
am
474c7042: merge in master-release history after reset to
931e6a86827af47c9cad1452bfab34fb8346cbaf
* commit '
474c704221a945b0dc7a0a3676d9bdda2dd5df01': (27 commits)
Fix bug #
15001610 Java crash in settings is observed while adding Google account on wiped device
Fix bug #
15109661 Settings crash after tap on back key from print settings
[WifiSettings] Fix NullPointerException during setup
Allow restore instance before setValues() in ListDialogPreference
Add a CREATOR in DashboardCategory to support Parcelable
Fix crash on settings launch in secondary user.
Fix crash when adding account
Fix settings crash during pathological rotate.
Fix bug #
14228591 NPE in settings app when it is launched by UiAutomator
Fix bug #
13744434 Stability: ISE in Settings: Can't switch to header... ..that has no Fragment nor Intent at SettingsActivity.onHeaderClick(SettingsActivity.java:654)
Add more logging for onHeaderClick(...)
Fix bug #
13794200 Settings crash when screen is locked and Power Usage... ...Settings is launched with an Intent
Re-enable on/off switch for Wi-Fi and Bluetooth Settings
Fix bug #
13563247 Settings crash on launch in secondary user
Fix bug #
13394626 Settings app crashes on changing orientation to landscape mode
Fix bug #
13300024 Settings app crashes on changing device orientation
Fix Fragment BackStack and Titles
Fix bug #
12957032 Stability-Sys: Java crash in com.android.settings: java.lang.NullPointerException: ...Attempt to invoke virtual method 'boolean android.os.Handler.sendEmptyMessage(int)' on a null object reference
There are several painful issues with the initial CL. Doing a revert for now and will rework this.
Fix bug #
12910775 Settings crash after tap on Access Point Names under Mobile networks
...
Alan Viverette [Fri, 23 May 2014 03:43:37 +0000 (20:43 -0700)]
Update references to private assets in Settings
Change-Id: Id7a788c3f7015baf991427082b6592589e62d372
Fabrice Di Meglio [Fri, 23 May 2014 02:29:31 +0000 (19:29 -0700)]
Fix bug #
15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE
- use onActivityCreated() / onResume() / onPause() for the SwitchBar
Change-Id: I24b346fdc5c19acedbe845d3b7697718412b5e5d
(cherry picked from commit
4c42a88828a8df9e00ce66216fe0ef9f0d89464d)
Fabrice Di Meglio [Fri, 23 May 2014 02:33:10 +0000 (02:33 +0000)]
Merge "Fix bug #
15173703 Crash in Settings is observed when Android Beam page orientation is changed."
Fabrice Di Meglio [Fri, 23 May 2014 02:29:31 +0000 (19:29 -0700)]
Fix bug #
15173703 Crash in Settings is observed when Android Beam page orientation is changed.
- use onActivityCreated() / onResume() / onPause() for the SwitchBar
Change-Id: I24b346fdc5c19acedbe845d3b7697718412b5e5d
Fabrice Di Meglio [Fri, 23 May 2014 02:19:41 +0000 (02:19 +0000)]
Merge "Sixth batch of new Quantum Theme assets"
Fabrice Di Meglio [Fri, 23 May 2014 02:17:36 +0000 (19:17 -0700)]
Sixth batch of new Quantum Theme assets
- needed for Quantum Theme support
See bug #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Iaec517aa448b1590bcb355ac8694b2e4e0c90292
Fabrice Di Meglio [Fri, 23 May 2014 01:18:04 +0000 (01:18 +0000)]
Merge "Fifth batch of new Quantum Theme assets"
Fabrice Di Meglio [Fri, 23 May 2014 01:14:24 +0000 (18:14 -0700)]
Fifth batch of new Quantum Theme assets
- needed for Quantum Theme support
See bug #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I04e31e277d59d97f7871dde6bdb6a7099c7a8d65
vandwalle [Thu, 22 May 2014 20:09:20 +0000 (13:09 -0700)]
when vervbose logging, keep track of a list of ScanResults per AP
Change-Id: Ib8f797de360f11eb9914a6aa44d418e1d0571973
Fabrice Di Meglio [Thu, 22 May 2014 18:29:40 +0000 (18:29 +0000)]
Merge "Fix bug #
15161058 Stability: ISE in Settings:Fragment DashboardSummary{
588de71} not attached to Activity"
Fabrice Di Meglio [Thu, 22 May 2014 18:27:43 +0000 (11:27 -0700)]
Fix bug #
15161058 Stability: ISE in Settings:Fragment DashboardSummary{
588de71} not attached to Activity
- prevent rebuilding the UI until the fragment got attached
Change-Id: I6d5fcbce2581f3fc9900f1ca4fc8178ee959061e
Jason Monk [Thu, 22 May 2014 18:24:58 +0000 (18:24 +0000)]
Merge "Add Editable PAC field to Proxy Configuration"
Jason Monk [Thu, 8 May 2014 17:44:07 +0000 (13:44 -0400)]
Add Editable PAC field to Proxy Configuration
Make PAC URL field not read only but now settable in advanced wifi
configuration options.
Bug:
14885470
Change-Id: I2c647f823d5c8a75b5fbf74434cbf0efcc4c50bf
Fabrice Di Meglio [Thu, 22 May 2014 17:32:46 +0000 (17:32 +0000)]
Merge "Optimize Dashboard loading"
Fabrice Di Meglio [Thu, 22 May 2014 17:30:03 +0000 (10:30 -0700)]
Optimize Dashboard loading
- prevent loading categories twice
- add some logging to see the time taken for building the Dashboard titles
Change-Id: I31724c0e66fe3b453a87f12476f58db84c73423f
The Android Automerger [Thu, 22 May 2014 14:22:30 +0000 (07:22 -0700)]
merge in master-release history after reset to
931e6a86827af47c9cad1452bfab34fb8346cbaf
Robert Greenwalt [Thu, 22 May 2014 13:23:06 +0000 (13:23 +0000)]
Merge "Move mobile data dis/enable to Telephony"
The Android Automerger [Thu, 22 May 2014 12:51:01 +0000 (05:51 -0700)]
merge in master-release history after reset to
c8e7e43a9df90bd2bdd823cdc61361427ecb4c4e
Robert Greenwalt [Thu, 22 May 2014 03:02:32 +0000 (20:02 -0700)]
Move mobile data dis/enable to Telephony
ConnectivityService doesn't do this anymore.
bug:
15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
vandwalle [Thu, 22 May 2014 03:36:48 +0000 (03:36 +0000)]
Merge "make verbose logging a wifimanager hidden API"
vandwalle [Wed, 21 May 2014 22:21:16 +0000 (15:21 -0700)]
make verbose logging a wifimanager hidden API
Change-Id: I092b7f507ad4dfdab16658929f02584a1fc22ba4
Baligh Uddin [Thu, 22 May 2014 03:24:23 +0000 (03:24 +0000)]
am
a8e1e7c9: (-s ours) am
6a0bfc9f: (-s ours) Import translations. DO NOT MERGE
* commit '
a8e1e7c9d08b0ccca7ccce7d5462fc2cdaaa3315':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:15:46 +0000 (03:15 +0000)]
am
6a0bfc9f: (-s ours) Import translations. DO NOT MERGE
* commit '
6a0bfc9f2b8989b971b12738906804b8e1abbdb5':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 22 May 2014 01:12:03 +0000 (01:12 +0000)]
Merge "Update highlight attribute"
Fabrice Di Meglio [Thu, 22 May 2014 00:37:35 +0000 (00:37 +0000)]
Merge "Fourth batch of new Quantum Theme assets"
Fabrice Di Meglio [Thu, 22 May 2014 00:35:53 +0000 (17:35 -0700)]
Fourth batch of new Quantum Theme assets
- needed for Quantum Theme support
See bug #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Ib0c8ef37e069a0c6ed9dd3461bc52055cf199de7
Fabrice Di Meglio [Wed, 21 May 2014 23:25:24 +0000 (23:25 +0000)]
Merge "Improve Preference highlighting for Search"
Alan Viverette [Wed, 21 May 2014 23:24:34 +0000 (16:24 -0700)]
Update highlight attribute
Change-Id: Ib9373bd3c89dbf28b4586d95306d02a3999b119e
Fabrice Di Meglio [Wed, 21 May 2014 23:19:41 +0000 (16:19 -0700)]
Improve Preference highlighting for Search
- cache hightlight Drawable
- set mPreferenceHighlighted as early as possible
Change-Id: I512d4677e94309175ead22c46b7a78e2aa387e1c
Baligh Uddin [Wed, 21 May 2014 21:52:35 +0000 (14:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbb361c506a6d3d88653e6699b00d79c344b8c98
Auto-generated-cl: translation import
Fabrice Di Meglio [Wed, 21 May 2014 21:32:18 +0000 (21:32 +0000)]
Merge "Fix HighlightingFragment"
Fabrice Di Meglio [Wed, 21 May 2014 21:26:52 +0000 (14:26 -0700)]
Fix HighlightingFragment
- get themed highlight drawable
Similar fix as I945eca98e1d73fda3b290a6ababfd1fb41118d8f
Change-Id: Ieabee16433ec29044a7a26875c3325231a287c88
Dianne Hackborn [Wed, 21 May 2014 21:26:24 +0000 (21:26 +0000)]
Merge "Update battery use chart to better match new mocks."
Dianne Hackborn [Fri, 16 May 2014 00:04:42 +0000 (17:04 -0700)]
Update battery use chart to better match new mocks.
Change-Id: I714cb30ccd9b8144785aee16a23ae2b723df4347
Alan Viverette [Wed, 21 May 2014 21:10:15 +0000 (21:10 +0000)]
Merge "Fix typo in Settings"
Alan Viverette [Wed, 21 May 2014 21:09:15 +0000 (14:09 -0700)]
Fix typo in Settings
Change-Id: I343242def31448fa5697e21bec3b35ee55e22d13
Fabrice Di Meglio [Wed, 21 May 2014 21:02:30 +0000 (21:02 +0000)]
Merge "Fix bug #
15115542 Ripple effect is crashing Settings with java.lang.NullPointerException"
Fabrice Di Meglio [Wed, 21 May 2014 20:58:46 +0000 (13:58 -0700)]
Fix bug #
15115542 Ripple effect is crashing Settings with 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
Christoph Studer [Wed, 21 May 2014 11:04:05 +0000 (13:04 +0200)]
Update NotificationListenerService API
Change-Id: I09089bf5063031c08e67a5e63e2997f8df727bfd
Baligh Uddin [Wed, 21 May 2014 15:42:51 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Paul Lawrence [Wed, 21 May 2014 14:09:00 +0000 (14:09 +0000)]
Merge "Add tablet pattern layout to avoid outsize patterns"
Paul Lawrence [Wed, 21 May 2014 14:08:44 +0000 (14:08 +0000)]
Merge "Fix landscape mode for pattern decrypt dialog"